Gitweb:     
http://git.kernel.org/git/?p=linux/kernel/git/torvalds/linux-2.6.git;a=commit;h=179b025fea2fa65760f1dcdff3585465d2177159
Commit:     179b025fea2fa65760f1dcdff3585465d2177159
Parent:     e9fa7c43aa74fae3a1db04092d2a51005f5b8a21
Author:     Randy Dunlap <[EMAIL PROTECTED]>
AuthorDate: Tue Oct 16 01:29:39 2007 -0700
Committer:  Linus Torvalds <[EMAIL PROTECTED]>
CommitDate: Tue Oct 16 09:43:20 2007 -0700

    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 <[EMAIL PROTECTED]>
    Acked-by: Dave Airlie <[EMAIL PROTECTED]>
    Signed-off-by: Antonino Daplas <[EMAIL PROTECTED]>
    Signed-off-by: Andrew Morton <[EMAIL PROTECTED]>
    Signed-off-by: Linus Torvalds <[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(-)

diff --git a/drivers/char/Kconfig b/drivers/char/Kconfig
index b391776..f6f8c03 100644
--- a/drivers/char/Kconfig
+++ b/drivers/char/Kconfig
@@ -896,10 +896,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
diff --git a/drivers/char/agp/Kconfig b/drivers/char/agp/Kconfig
index 713533d..f22c253 100644
--- 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
diff --git a/drivers/char/drm/Kconfig b/drivers/char/drm/Kconfig
index 0b7ffa5..ba3058d 100644
--- 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.
 #
-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
diff --git a/drivers/video/Kconfig b/drivers/video/Kconfig
index 54db099..efe474e 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
-
-
To unsubscribe from this list: send the line "unsubscribe git-commits-head" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Reply via email to