diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2012-07-12 11:55:40 -0400 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2012-07-12 11:55:40 -0400 |
| commit | 9c63cd5a955ce8a3de1776a9e4b6b89c69b2a09e (patch) | |
| tree | 2b628ebdaeb63603d90c92e78bc5dd668856b61d /drivers/video/backlight/Kconfig | |
| parent | 8c203360a751ecbf876a8324e02c1dcbcc5dd548 (diff) | |
| parent | 34ae0dadb4e99e8177f9785e069e9cca636ef8c1 (diff) | |
Merge tag 'imx-defconfig' of git://git.pengutronix.de/git/imx/linux-2.6 into next/defconfig
From Sascha Hauer <s.hauer@pengutronix.de>:
ARM i.MX defconfig updates for v3.6
* tag 'imx-defconfig' of git://git.pengutronix.de/git/imx/linux-2.6:
ARM: imx_v4_v5_defconfig: update features
ARM: imx_v6_v7_defconfig: update features
Includes an update to v3.5-rc5
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
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 | |||
| 88 | 88 | ||
| 89 | config LCD_TOSA | 89 | config LCD_TOSA |
| 90 | tristate "Sharp SL-6000 LCD Driver" | 90 | tristate "Sharp SL-6000 LCD Driver" |
| 91 | depends on SPI && MACH_TOSA | 91 | depends on I2C && SPI && MACH_TOSA |
| 92 | help | 92 | help |
| 93 | If you have an Sharp SL-6000 Zaurus say Y to enable a driver | 93 | If you have an Sharp SL-6000 Zaurus say Y to enable a driver |
| 94 | for its LCD. | 94 | for its LCD. |