diff options
author | Philippe Langlais <philippe.langlais@stericsson.com> | 2012-06-04 19:45:30 +0800 |
---|---|---|
committer | Philippe Langlais <philippe.langlais@stericsson.com> | 2012-06-04 19:45:30 +0800 |
commit | 1cd04b2aba9f3b3468adf0789030240e032d8d3e (patch) | |
tree | 2e010c15b347b7acda9bc7a2ab4abca9d58043eb /drivers/video/Kconfig | |
parent | cff72c10aa27e3a74eb5d5b7ceb7808d8c917d15 (diff) | |
parent | b7086e0a1dec82bf7e8e96e17738151f0aee82fc (diff) |
Merge topic branch 'video' into integration-linux-ux500
Signed-off-by: Philippe Langlais <philippe.langlais@stericsson.com>
Diffstat (limited to 'drivers/video/Kconfig')
-rw-r--r-- | drivers/video/Kconfig | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/drivers/video/Kconfig b/drivers/video/Kconfig index a290be51a1f..93a7c86171e 100644 --- a/drivers/video/Kconfig +++ b/drivers/video/Kconfig @@ -286,6 +286,8 @@ config FB_CIRRUS Say N unless you have such a graphics board or plan to get one before you next recompile the kernel. +source "drivers/video/mcde/Kconfig" + config FB_PM2 tristate "Permedia2 support" depends on FB && ((AMIGA && BROKEN) || PCI) @@ -2415,6 +2417,8 @@ source "drivers/video/omap/Kconfig" source "drivers/video/omap2/Kconfig" source "drivers/video/exynos/Kconfig" source "drivers/video/backlight/Kconfig" +source "drivers/video/av8100/Kconfig" +source "drivers/video/b2r2/Kconfig" if VT source "drivers/video/console/Kconfig" |