Rationalise DRM Kconfig: - Move the Kconfig options from "Character devices" to "Graphics support". - Move the sparc64 Kconfig options into drivers/char/drm now that drivers/char/drm/Kconfig gets picked up through drivers/video/Kconfig
I think the drm directory should be moved from drivers/char to drivers/video, but it's more important to get the user's config experience right. Signed-off-by: Matthew Wilcox <[EMAIL PROTECTED]> Index: arch/sparc64/Kconfig =================================================================== RCS file: /var/cvs/linux-2.6/arch/sparc64/Kconfig,v retrieving revision 1.22 diff -u -p -r1.22 Kconfig --- arch/sparc64/Kconfig 22 Jan 2005 14:59:04 -0000 1.22 +++ arch/sparc64/Kconfig 9 Feb 2005 15:49:55 -0000 @@ -539,44 +539,6 @@ config UNIX98_PTY_COUNT endmenu -menu "XFree86 DRI support" - -config DRM - bool "Direct Rendering Manager (XFree86 DRI support)" - help - Kernel-level support for the Direct Rendering Infrastructure (DRI) - introduced in XFree86 4.0. If you say Y here, you need to select - the module that's right for your graphics card from the list below. - These modules provide support for synchronization, security, and - DMA transfers. Please see <http://dri.sourceforge.net/> for more - details. You should also select and configure AGP - (/dev/agpgart) support. - -config DRM_FFB - tristate "Creator/Creator3D" - depends on DRM && BROKEN - help - Choose this option if you have one of Sun's Creator3D-based graphics - and frame buffer cards. Product page at - <http://www.sun.com/desktop/products/Graphics/creator3d.html>. - -config DRM_TDFX - tristate "3dfx Banshee/Voodoo3+" - depends on DRM - help - Choose this option if you have a 3dfx Banshee or Voodoo3 (or later), - graphics card. If M is selected, the module will be called tdfx. - -config DRM_R128 - tristate "ATI Rage 128" - depends on DRM - help - Choose this option if you have an ATI Rage 128 graphics card. If M - is selected, the module will be called r128. AGP support for - this card is strongly suggested (unless you have a PCI version). - -endmenu - source "drivers/input/Kconfig" source "drivers/i2c/Kconfig" Index: drivers/char/Kconfig =================================================================== RCS file: /var/cvs/linux-2.6/drivers/char/Kconfig,v retrieving revision 1.26 diff -u -p -r1.26 Kconfig --- drivers/char/Kconfig 22 Jan 2005 14:59:12 -0000 1.26 +++ drivers/char/Kconfig 9 Feb 2005 15:49:57 -0000 @@ -901,8 +901,6 @@ endmenu source "drivers/char/agp/Kconfig" -source "drivers/char/drm/Kconfig" - source "drivers/char/pcmcia/Kconfig" config MWAVE Index: drivers/char/drm/Kconfig =================================================================== RCS file: /var/cvs/linux-2.6/drivers/char/drm/Kconfig,v retrieving revision 1.8 diff -u -p -r1.8 Kconfig --- drivers/char/drm/Kconfig 12 Jan 2005 20:16:17 -0000 1.8 +++ drivers/char/drm/Kconfig 9 Feb 2005 15:49:57 -0000 @@ -96,3 +96,11 @@ config DRM_SIS chipset. If M is selected the module will be called sis. AGP support is required for this driver to work. +config DRM_FFB + tristate "Creator/Creator3D" + depends on DRM && SPARC64 && BROKEN + help + Choose this option if you have one of Sun's Creator3D-based graphics + and frame buffer cards. Product page at + <http://www.sun.com/desktop/products/Graphics/creator3d.html>. + Index: drivers/video/Kconfig =================================================================== RCS file: /var/cvs/linux-2.6/drivers/video/Kconfig,v retrieving revision 1.20 diff -u -p -r1.20 Kconfig --- drivers/video/Kconfig 22 Jan 2005 14:59:38 -0000 1.20 +++ drivers/video/Kconfig 9 Feb 2005 15:50:00 -0000 @@ -4,6 +4,8 @@ menu "Graphics support" +source "drivers/char/drm/Kconfig" + config FB bool "Support for frame buffer devices" ---help--- -- "Next the statesmen will invent cheap lies, putting the blame upon the nation that is attacked, and every man will be glad of those conscience-soothing falsities, and will diligently study them, and refuse to examine any refutations of them; and thus he will by and by convince himself that the war is just, and will thank God for the better sleep he enjoys after this process of grotesque self-deception." -- Mark Twain ------------------------------------------------------- SF email is sponsored by - The IT Product Guide Read honest & candid reviews on hundreds of IT Products from real users. Discover which products truly live up to the hype. Start reading now. http://ads.osdn.com/?ad_id=6595&alloc_id=14396&op=click -- _______________________________________________ Dri-devel mailing list Dri-devel@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/dri-devel
