aboutsummaryrefslogtreecommitdiff
path: root/drivers/video
diff options
context:
space:
mode:
authorRandy Dunlap <randy.dunlap@oracle.com>2007-10-16 01:29:39 -0700
committerLinus Torvalds <torvalds@woody.linux-foundation.org>2007-10-16 09:43:20 -0700
commit179b025fea2fa65760f1dcdff3585465d2177159 (patch)
tree9beb639ced5388f5b203c1b3b4725dba96b19a0a /drivers/video
parente9fa7c43aa74fae3a1db04092d2a51005f5b8a21 (diff)
video gfx: merge kconfig menus
Move AGP and DRM menus into the video graphics support menu. They use 'menuconfig' so that they can all be disabled with one selection. Make the console menu use 'menuconfig' so that it can all be disabled with one selection. Make the frame buffer menu use 'menuconfig' so that it can all be disabled with one selection. Signed-off-by: Randy Dunlap <randy.dunlap@oracle.com> Acked-by: Dave Airlie <airlied@linux.ie> Signed-off-by: Antonino Daplas <adaplas@gmail.com> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'drivers/video')
-rw-r--r--drivers/video/Kconfig11
1 files changed, 7 insertions, 4 deletions
diff --git a/drivers/video/Kconfig b/drivers/video/Kconfig
index 54db0991991..efe474e2cc3 100644
--- a/drivers/video/Kconfig
+++ b/drivers/video/Kconfig
@@ -5,8 +5,9 @@
menu "Graphics support"
depends on HAS_IOMEM
-source "drivers/video/backlight/Kconfig"
-source "drivers/video/display/Kconfig"
+source "drivers/char/agp/Kconfig"
+
+source "drivers/char/drm/Kconfig"
config VGASTATE
tristate
@@ -19,7 +20,7 @@ config VIDEO_OUTPUT_CONTROL
This framework adds support for low-level control of the video
output switch.
-config FB
+menuconfig FB
tristate "Support for frame buffer devices"
---help---
The frame buffer device provides an abstraction for the graphics
@@ -1896,6 +1897,9 @@ if ARCH_OMAP
source "drivers/video/omap/Kconfig"
endif
+source "drivers/video/backlight/Kconfig"
+source "drivers/video/display/Kconfig"
+
if VT
source "drivers/video/console/Kconfig"
endif
@@ -1905,4 +1909,3 @@ if FB || SGI_NEWPORT_CONSOLE
endif
endmenu
-