summaryrefslogtreecommitdiffstats
path: root/drivers/char/drm
diff options
context:
space:
mode:
authorRandy Dunlap <randy.dunlap@oracle.com>2007-10-16 10:29:39 +0200
committerLinus Torvalds <torvalds@woody.linux-foundation.org>2007-10-16 18:43:20 +0200
commit179b025fea2fa65760f1dcdff3585465d2177159 (patch)
tree9beb639ced5388f5b203c1b3b4725dba96b19a0a /drivers/char/drm
parentbf54x-lq043fb: framebuffer driver for Blackfin BF54x framebuffer device driver (diff)
downloadlinux-179b025fea2fa65760f1dcdff3585465d2177159.tar.xz
linux-179b025fea2fa65760f1dcdff3585465d2177159.zip
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/Kconfig2
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 @@
# 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