diff options
author | Philippe Langlais <philippe.langlais@stericsson.com> | 2012-04-06 11:11:25 +0200 |
---|---|---|
committer | Philippe Langlais <philippe.langlais@stericsson.com> | 2012-04-06 11:11:25 +0200 |
commit | 1824f16fd3633ea156a90926db7fca2606481346 (patch) | |
tree | 428667dbccfe0fdf8d33bee5a18e8cf1aa0b7767 /drivers/video/Kconfig | |
parent | 453e007c74a011b84260aab6c28250635de2e322 (diff) | |
parent | f7d8ac55db0b41ed64c4cd37f5d51bbd5bb8e776 (diff) |
Merge topic branch 'video' into integration-linux-ux500-3.3
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 6ca0c407c14..fe960f49b8a 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) @@ -2413,6 +2415,8 @@ source "drivers/video/omap/Kconfig" source "drivers/video/omap2/Kconfig" source "drivers/video/backlight/Kconfig" +source "drivers/video/av8100/Kconfig" +source "drivers/video/b2r2/Kconfig" if VT source "drivers/video/console/Kconfig" |