diff options
| author |   José Pekkarinen <jose.pekkarinen@nokia.com> | 2016-04-11 10:41:07 +0300 |
|---|---|---|
| committer | José Pekkarinen <jose.pekkarinen@nokia.com> | 2016-04-13 08:17:18 +0300 |
| commit | e09b41010ba33a20a87472ee821fa407a5b8da36 (patch) | |
| tree | d10dc367189862e7ca5c592f033dc3726e1df4e3 /kernel/drivers/video/fbdev/omap | |
| parent | f93b97fd65072de626c074dbe099a1fff05ce060 (diff) | |
These changes are the raw update to linux-4.4.6-rt14. Kernel sources
are taken from kernel.org, and rt patch from the rt wiki download page.
During the rebasing, the following patch collided:
Force tick interrupt and get rid of softirq magic(I70131fb85).
Collisions have been removed because its logic was found on the
source already.
Change-Id: I7f57a4081d9deaa0d9ccfc41a6c8daccdee3b769
Signed-off-by: José Pekkarinen <jose.pekkarinen@nokia.com>
Diffstat (limited to 'kernel/drivers/video/fbdev/omap')
| -rw-r--r-- | kernel/drivers/video/fbdev/omap/Kconfig | 2 | ||||
| -rw-r--r-- | kernel/drivers/video/fbdev/omap/lcd_mipid.c | 1 | ||||
| -rw-r--r-- | kernel/drivers/video/fbdev/omap/omapfb_main.c | 5 |
3 files changed, 1 insertions, 7 deletions
diff --git a/kernel/drivers/video/fbdev/omap/Kconfig b/kernel/drivers/video/fbdev/omap/Kconfig index 18c4cb0d5..29d250da8 100644 --- a/kernel/drivers/video/fbdev/omap/Kconfig +++ b/kernel/drivers/video/fbdev/omap/Kconfig @@ -42,7 +42,7 @@ config FB_OMAP_LCD_MIPID config FB_OMAP_LCD_H3 bool "TPS65010 LCD controller on OMAP-H3" depends on MACH_OMAP_H3 - depends on TPS65010 + depends on TPS65010=y default y help Say Y here if you want to have support for the LCD on the diff --git a/kernel/drivers/video/fbdev/omap/lcd_mipid.c b/kernel/drivers/video/fbdev/omap/lcd_mipid.c index 803fee618..0e4cee9a8 100644 --- a/kernel/drivers/video/fbdev/omap/lcd_mipid.c +++ b/kernel/drivers/video/fbdev/omap/lcd_mipid.c @@ -603,7 +603,6 @@ static int mipid_spi_remove(struct spi_device *spi) static struct spi_driver mipid_spi_driver = { .driver = { .name = MIPID_MODULE_NAME, - .owner = THIS_MODULE, }, .probe = mipid_spi_probe, .remove = mipid_spi_remove, diff --git a/kernel/drivers/video/fbdev/omap/omapfb_main.c b/kernel/drivers/video/fbdev/omap/omapfb_main.c index 1fb3ea3c9..393ae1bc0 100644 --- a/kernel/drivers/video/fbdev/omap/omapfb_main.c +++ b/kernel/drivers/video/fbdev/omap/omapfb_main.c @@ -276,11 +276,6 @@ static int _setcolreg(struct fb_info *info, u_int regno, u_int red, u_int green, if (r != 0) break; - if (regno < 0) { - r = -EINVAL; - break; - } - if (regno < 16) { u16 pal; pal = ((red >> (16 - var->red.length)) << |