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>
This commit is contained in:
parent
e9fa7c43aa
commit
179b025fea
|
@ -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
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
config AGP
|
||||
menuconfig AGP
|
||||
tristate "/dev/agpgart (AGP Support)"
|
||||
depends on ALPHA || IA64 || PARISC || PPC || X86
|
||||
depends on PCI
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -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
|
||||
|
||||
|
|
Loading…
Reference in a new issue