diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2012-06-17 03:59:05 +0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2012-06-17 03:59:05 +0400 |
| commit | 88c144b12a943d35500dbfc141c9b33955d2a88a (patch) | |
| tree | 5dd943ac3dd80d2c8e7f1af468314468dba541cd /drivers/video/backlight/Kconfig | |
| parent | 9b15b817f3d62409290fd56fe3cbb076a931bb0a (diff) | |
| parent | b67989515defba7412acff01162e5bb1f0f5923a (diff) | |
| download | linux-88c144b12a943d35500dbfc141c9b33955d2a88a.tar.xz | |
Merge tag 'fbdev-fixes-for-3.5-1' of git://github.com/schandinat/linux-2.6
Pull fbdev fixes from Florian Tobias Schandinat:
- two fixes for s3c-fb by Jingoo Han (including a fix for a potential
division by zero)
- a couple of randconfig fixes by Arnd Bergmann
- a cleanup for bfin_adv7393fb by Emil Goode
* tag 'fbdev-fixes-for-3.5-1' of git://github.com/schandinat/linux-2.6:
video: s3c-fb: fix possible division by zero in s3c_fb_calc_pixclk
video: s3c-fb: clear SHADOWCON register when clearing hardware window registers
drivers/tosa: driver needs I2C and SPI to compile
drivers/savagefb: use mdelay instead of udelay
video/console: automatically select a font
video/ili9320: do not mark exported functions __devexit
drivers/video: use correct __devexit_p annotation
video: bfin_adv7393fb: Convert to kstrtouint_from_user
Diffstat (limited to 'drivers/video/backlight/Kconfig')
| -rw-r--r-- | drivers/video/backlight/Kconfig | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/video/backlight/Kconfig b/drivers/video/backlight/Kconfig index fa2b03750316..2979292650d6 100644 --- a/drivers/video/backlight/Kconfig +++ b/drivers/video/backlight/Kconfig @@ -88,7 +88,7 @@ config LCD_PLATFORM config LCD_TOSA tristate "Sharp SL-6000 LCD Driver" - depends on SPI && MACH_TOSA + depends on I2C && SPI && MACH_TOSA help If you have an Sharp SL-6000 Zaurus say Y to enable a driver for its LCD. |