diff options
author | Randy Dunlap <randy.dunlap@oracle.com> | 2007-10-16 04:29:39 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-10-16 12:43:20 -0400 |
commit | 179b025fea2fa65760f1dcdff3585465d2177159 (patch) | |
tree | 9beb639ced5388f5b203c1b3b4725dba96b19a0a /drivers/char/drm | |
parent | e9fa7c43aa74fae3a1db04092d2a51005f5b8a21 (diff) |
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>
Diffstat (limited to 'drivers/char/drm')
-rw-r--r-- | drivers/char/drm/Kconfig | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/char/drm/Kconfig b/drivers/char/drm/Kconfig index 0b7ffa5191c6..ba3058dd39a7 100644 --- a/drivers/char/drm/Kconfig +++ b/drivers/char/drm/Kconfig | |||
@@ -4,7 +4,7 @@ | |||
4 | # This driver provides support for the | 4 | # This driver provides support for the |
5 | # Direct Rendering Infrastructure (DRI) in XFree86 4.1.0 and higher. | 5 | # Direct Rendering Infrastructure (DRI) in XFree86 4.1.0 and higher. |
6 | # | 6 | # |
7 | config DRM | 7 | menuconfig DRM |
8 | tristate "Direct Rendering Manager (XFree86 4.1.0 and higher DRI support)" | 8 | tristate "Direct Rendering Manager (XFree86 4.1.0 and higher DRI support)" |
9 | depends on (AGP || AGP=n) && PCI && !EMULATED_CMPXCHG | 9 | depends on (AGP || AGP=n) && PCI && !EMULATED_CMPXCHG |
10 | help | 10 | help |