Merge remote-tracking branch 'stable/linux-4.19.y' into rpi-4.19.y
authorpopcornmix <popcornmix@gmail.com>
Tue, 26 Nov 2019 11:45:13 +0000 (11:45 +0000)
committerpopcornmix <popcornmix@gmail.com>
Tue, 26 Nov 2019 11:45:13 +0000 (11:45 +0000)
1  2 
drivers/clk/Makefile
drivers/i2c/busses/Kconfig
drivers/opp/core.c
drivers/spi/spidev.c
drivers/video/fbdev/Kconfig

Simple merge
Simple merge
Simple merge
Simple merge
@@@ -2356,15 -2336,6 +2350,19 @@@ config FB_SM71
          called sm712fb. If you want to compile it as a module, say M
          here and read <file:Documentation/kbuild/modules.txt>.
  
 +config FB_RPISENSE
 +      tristate "Raspberry Pi Sense HAT framebuffer"
 +      depends on FB
 +      select MFD_RPISENSE_CORE
 +      select FB_SYS_FOPS
 +      select FB_SYS_FILLRECT
 +      select FB_SYS_COPYAREA
 +      select FB_SYS_IMAGEBLIT
 +      select FB_DEFERRED_IO
 +
 +      help
 +        This is the framebuffer driver for the Raspberry Pi Sense HAT
++
+ source "drivers/video/fbdev/omap/Kconfig"
+ source "drivers/video/fbdev/omap2/Kconfig"
+ source "drivers/video/fbdev/mmp/Kconfig"