Commit 179b025f authored by Randy Dunlap's avatar Randy Dunlap Committed by Linus Torvalds
Browse files

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: default avatarRandy Dunlap <randy.dunlap@oracle.com>
Acked-by: default avatarDave Airlie <airlied@linux.ie>
Signed-off-by: default avatarAntonino Daplas <adaplas@gmail.com>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent e9fa7c43

drivers/char/Kconfig

+0 −4
Original line number Original line Diff line number Diff line
@@ -896,10 +896,6 @@ config GPIO_TB0219 
	depends on TANBAC_TB022X

	depends on TANBAC_TB022X

	select GPIO_VR41XX

	select GPIO_VR41XX





source "drivers/char/agp/Kconfig"



source "drivers/char/drm/Kconfig"



source "drivers/char/pcmcia/Kconfig"

source "drivers/char/pcmcia/Kconfig"





config MWAVE

config MWAVE

drivers/char/agp/Kconfig

+1 −1
Original line number Original line Diff line number Diff line 
config AGP

menuconfig AGP

	tristate "/dev/agpgart (AGP Support)"

	tristate "/dev/agpgart (AGP Support)"

	depends on ALPHA || IA64 || PARISC || PPC || X86

	depends on ALPHA || IA64 || PARISC || PPC || X86

	depends on PCI

	depends on PCI

drivers/char/drm/Kconfig

+1 −1
Original line number Original line Diff line number Diff line
@@ -4,7 +4,7 @@ 
# This driver provides support for the

# This driver provides support for the

# Direct Rendering Infrastructure (DRI) in XFree86 4.1.0 and higher.

# 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)"

	tristate "Direct Rendering Manager (XFree86 4.1.0 and higher DRI support)"

	depends on (AGP || AGP=n) && PCI && !EMULATED_CMPXCHG

	depends on (AGP || AGP=n) && PCI && !EMULATED_CMPXCHG

	help

	help

drivers/video/Kconfig

+7 −4
Original line number Original line Diff line number Diff line
@@ -5,8 +5,9 @@ 
menu "Graphics support"

menu "Graphics support"

	depends on HAS_IOMEM

	depends on HAS_IOMEM





source "drivers/video/backlight/Kconfig"

source "drivers/char/agp/Kconfig"

source "drivers/video/display/Kconfig"



source "drivers/char/drm/Kconfig"





config VGASTATE

config VGASTATE

       tristate

       tristate
@@ -19,7 +20,7 @@ config VIDEO_OUTPUT_CONTROL 
	  This framework adds support for low-level control of the video 

	  This framework adds support for low-level control of the video 

	  output switch.

	  output switch.





config FB

menuconfig FB

	tristate "Support for frame buffer devices"

	tristate "Support for frame buffer devices"

	---help---

	---help---

	  The frame buffer device provides an abstraction for the graphics

	  The frame buffer device provides an abstraction for the graphics
@@ -1896,6 +1897,9 @@ if ARCH_OMAP 
	source "drivers/video/omap/Kconfig"

	source "drivers/video/omap/Kconfig"

endif

endif





source "drivers/video/backlight/Kconfig"

source "drivers/video/display/Kconfig"



if VT

if VT

	source "drivers/video/console/Kconfig"

	source "drivers/video/console/Kconfig"

endif

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

endif





endmenu
 
endmenu