video gfx: merge kconfig menus

PATCH In review Antonino A. Daplas 1 participant 1 message Sep 29, 2007

Subsystems (3)

Framebuffer layer Char and misc drivers Agpgart driver

lore

Share & tools

lore

Antonino A. Daplas

author

2007-09-29 02:48 UTC #0 lore raw

PATCH 8/17 video gfx: merge kconfig menus

From: Randy Dunlap <[email protected]>

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 <[email protected]>

Acked-by Dave Airlie <[email protected]>

Signed-off-by Antonino Daplas <[email protected]>

---

 drivers/char/Kconfig     |    4 ----
 drivers/char/agp/Kconfig |    2 +-
 drivers/char/drm/Kconfig |    2 +-
 drivers/video/Kconfig    |   11 +++++++----
 4 files changed, 9 insertions(+), 10 deletions(-)

drivers/char/Kconfig +0 -4

index 045f74c..d9bc0b3 100644
@@ -925,10 +925,6 @@ config GPIO_TB0219
 	depends on TANBAC_TB022X
 	select GPIO_VR41XX
 
-source "drivers/char/agp/Kconfig"
-
-source "drivers/char/drm/Kconfig"
-
 source "drivers/char/pcmcia/Kconfig"
 
 config MWAVE

drivers/char/agp/Kconfig +1 -1

index 713533d..f22c253 100644
@@ -1,4 +1,4 @@
-config AGP
+menuconfig AGP
 	tristate "/dev/agpgart (AGP Support)"
 	depends on ALPHA || IA64 || PARISC || PPC || X86
 	depends on PCI

drivers/char/drm/Kconfig +1 -1

index 0b7ffa5..ba3058d 100644
@@ -4,7 +4,7 @@ #
 # This driver provides support for the
 # Direct Rendering Infrastructure (DRI) in XFree86 4.1.0 and higher.
 #
-config DRM
+menuconfig DRM
 	tristate "Direct Rendering Manager (XFree86 4.1.0 and higher DRI support)"
 	depends on (AGP || AGP=n) && PCI && !EMULATED_CMPXCHG
 	help

drivers/video/Kconfig +7 -4

index fbee300..282c351 100644
@@ -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

@@ -18,7 +19,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

@@ -1906,6 +1907,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

@@ -1915,4 +1919,3 @@ if FB || SGI_NEWPORT_CONSOLE
 endif
 
 endmenu
-

-------------------------------------------------------------------------
This SF.net email is sponsored by: Microsoft Defy all challenges. Microsoft(R) Visual Studio 2005.
http://clk.atdmt.com/MRT/go/vse0120000070mrt/direct/01/