Moved AGP and DRM code back to drivers/char until a proper solution is done...

Moved AGP and DRM code back to drivers/char until a proper solution is done for handling AGP/DMA based framebuffer devices.

drivers/char/Config.in

@@ -184,6 +184,9 @@ if [ "$CONFIG_FTAPE" != "n" ]; then
 fi
 endmenu
 
+source drivers/char/agp/Config.in
+source drivers/char/drm/Config.in
+
 if [ "$CONFIG_HOTPLUG" = "y" -a "$CONFIG_PCMCIA" != "n" ]; then
    source drivers/char/pcmcia/Config.in
 fi

drivers/char/Makefile

@@ -100,6 +100,8 @@ obj-$(CONFIG_SH_WDT) += shwdt.o
 obj-$(CONFIG_EUROTECH_WDT) += eurotechwdt.o
 obj-$(CONFIG_SOFT_WATCHDOG) += softdog.o
 obj-$(CONFIG_MWAVE) += mwave/
+obj-$(CONFIG_AGP) += agp/
+obj-$(CONFIG_DRM) += drm/
 obj-$(CONFIG_PCMCIA) += pcmcia/
 
 # Files generated that shall be removed upon make clean

drivers/video/Config.in

@@ -5,9 +5,6 @@
 mainmenu_option next_comment
 comment 'Graphics support'
 
-source drivers/video/agp/Config.in
-source drivers/video/drm/Config.in
-
 bool 'Support for frame buffer devices ' CONFIG_FB
 
 if [ "$CONFIG_FB" = "y" ]; then

drivers/video/Makefile

@@ -9,8 +9,6 @@ export-objs    	:= fbmem.o fbcmap.o fbgen.o fbmon.o modedb.o cyber2000fb.o
 
 # Each configuration option enables a list of files.
 
-obj-$(CONFIG_AGP)		  += agp/
-obj-$(CONFIG_DRM)		  += drm/
 obj-$(CONFIG_VT)		  += console/
 
 # Add fbmon.o back into obj-$(CONFIG_FB) in 2.5.x