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>

diff --git a/drivers/char/Kconfig b/drivers/char/Kconfig
index b391776e5bf31ca24f45eea0576e63364c2c2c80..f6f8c03047fa8b44f0b8aa751c331e6677c820a9 100644 (file)
--- a/drivers/char/Kconfig
+++ b/drivers/char/Kconfig
@@ -896,10 +896,6 @@ config GPIO_TB0219
        depends on TANBAC_TB022X
        select GPIO_VR41XX
 
        depends on TANBAC_TB022X
        select GPIO_VR41XX
 

-source "drivers/char/agp/Kconfig"
-
-source "drivers/char/drm/Kconfig"
-

 source "drivers/char/pcmcia/Kconfig"
 
 config MWAVE
 source "drivers/char/pcmcia/Kconfig"
 
 config MWAVE

diff --git a/drivers/char/agp/Kconfig b/drivers/char/agp/Kconfig
index 713533d8a86e7449156113d1e40e0da69d1deafc..f22c253bc09fbb4bcb84b6d5642848a82a3920c0 100644 (file)
--- a/drivers/char/agp/Kconfig
+++ b/drivers/char/agp/Kconfig
@@ -1,4 +1,4 @@
-config AGP
+menuconfig AGP

        tristate "/dev/agpgart (AGP Support)"
        depends on ALPHA || IA64 || PARISC || PPC || X86
        depends on PCI
        tristate "/dev/agpgart (AGP Support)"
        depends on ALPHA || IA64 || PARISC || PPC || X86
        depends on PCI

diff --git a/drivers/char/drm/Kconfig b/drivers/char/drm/Kconfig
index 0b7ffa5191c64e3c22433e3303c841265cc20a0d..ba3058dd39a743b11f0a88b85acbce5e34e758a3 100644 (file)
--- a/drivers/char/drm/Kconfig
+++ b/drivers/char/drm/Kconfig
@@ -4,7 +4,7 @@
 # This driver provides support for the
 # Direct Rendering Infrastructure (DRI) in XFree86 4.1.0 and higher.
 #
 # 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
        tristate "Direct Rendering Manager (XFree86 4.1.0 and higher DRI support)"
        depends on (AGP || AGP=n) && PCI && !EMULATED_CMPXCHG
        help

diff --git a/drivers/video/Kconfig b/drivers/video/Kconfig
index 54db0991991cad4365f93ac83a6562153935eb53..efe474e2cc3bd70d13d5a29709fd7bc426ff89a1 100644 (file)
--- a/drivers/video/Kconfig
+++ b/drivers/video/Kconfig
@@ -5,8 +5,9 @@
 menu "Graphics support"
        depends on HAS_IOMEM
 
 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
 
 config VGASTATE
        tristate


@@ -19,7 +20,7 @@ config VIDEO_OUTPUT_CONTROL
          This framework adds support for low-level control of the video 
          output switch.
 
          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
        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/omap/Kconfig"
 endif
 

+source "drivers/video/backlight/Kconfig"
+source "drivers/video/display/Kconfig"
+

 if VT
        source "drivers/video/console/Kconfig"
 endif
 if VT
        source "drivers/video/console/Kconfig"
 endif


@@ -1905,4 +1909,3 @@ if FB || SGI_NEWPORT_CONSOLE
 endif
 
 endmenu
 endif
 
 endmenu

-