summaryrefslogtreecommitdiffstats
path: root/drivers/video/Kconfig
diff options
context:
space:
mode:
authorSascha Hauer <s.hauer@pengutronix.de>2012-12-08 12:22:21 +0100
committerSascha Hauer <s.hauer@pengutronix.de>2012-12-08 12:22:21 +0100
commit8030ab24fa042a356b958dd1ccf0338b0d2c8418 (patch)
treea6882bc2b56ca6120ed450aa2d860361a88b8025 /drivers/video/Kconfig
parent6d7dcfbccfa2a42b16eb7529a3785fdac25c8705 (diff)
parentc209c186e0e4f3bb5731ae4593350e0bc8554bcd (diff)
downloadbarebox-8030ab24fa042a356b958dd1ccf0338b0d2c8418.tar.gz
barebox-8030ab24fa042a356b958dd1ccf0338b0d2c8418.tar.xz
Merge branch 'kconfig'
Diffstat (limited to 'drivers/video/Kconfig')
-rw-r--r--drivers/video/Kconfig6
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/video/Kconfig b/drivers/video/Kconfig
index 4aa92c5993..354e68b45c 100644
--- a/drivers/video/Kconfig
+++ b/drivers/video/Kconfig
@@ -1,5 +1,5 @@
menuconfig VIDEO
- bool "Video drivers "
+ bool "Video drivers"
help
Add support for framebuffer and splash screens
@@ -15,14 +15,14 @@ config IMXFB_DRIVER_VIDEO_IMX_OVERLAY
config DRIVER_VIDEO_IMX_IPU
bool "i.MX31/35 framebuffer driver"
- depends on ARCH_IMX35 || ARCH_IMX_31
+ depends on ARCH_IMX35 || ARCH_IMX31
help
Add support for the IPU framebuffer device found on
i.MX31 and i.MX35 CPUs.
config DRIVER_VIDEO_IMX_IPU_OVERLAY
bool "i.MX31/35 framebuffer overlay support"
- depends on DRIVER_VIDEO_IMX_IPU && (ARCH_IMX35 || ARCH_IMX_31)
+ depends on DRIVER_VIDEO_IMX_IPU && (ARCH_IMX35 || ARCH_IMX31)
config DRIVER_VIDEO_STM
bool "i.MX23/28 framebuffer driver"