[PATCH] fbdev: Initialize i810fb after agpgart

This patch places 'video/i810/' after 'char/' in drivers/Makefile.  This order
change makes it unnecessary for i810fb to explicitly call agp_intel_init().
This is untested, as I don't have any i810 hardware anymore, but I believe it
will work.  If it does, the ugly 'early initialization hack' in
drivers/char/agp/intel-agp.c:agp_intel_init() can be removed (haven't done it
yet).
Signed-off-by: Antonino Daplas <adaplas@pol.net>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

drivers/Makefile

@@ -16,6 +16,10 @@ obj-$(CONFIG_PNP)		+= pnp/
 # char/ comes before serial/ etc so that the VT console is the boot-time
 # default.
 obj-y				+= char/
+
+# i810fb depends on char/agp/
+obj-$(CONFIG_FB_I810)           += video/i810/
+
 # we also need input/serio early so serio bus is initialized by the time
 # serial drivers start registering their serio ports
 obj-$(CONFIG_SERIO)		+= input/serio/

drivers/video/Makefile

@@ -61,9 +61,8 @@ obj-$(CONFIG_FB_SIS)		  += sis/ cfbcopyarea.o cfbfillrect.o cfbimgblt.o
 obj-$(CONFIG_FB_ATY)		  += aty/ cfbcopyarea.o cfbfillrect.o cfbimgblt.o
 obj-$(CONFIG_FB_ATY128)		  += aty/ cfbcopyarea.o cfbfillrect.o cfbimgblt.o
 obj-$(CONFIG_FB_RADEON)		  += aty/ cfbcopyarea.o cfbfillrect.o cfbimgblt.o
-obj-$(CONFIG_FB_I810)             += i810/ cfbfillrect.o cfbcopyarea.o \
-	                             cfbimgblt.o vgastate.o
-
+obj-$(CONFIG_FB_I810)             += cfbcopyarea.o cfbfillrect.o cfbimgblt.o \
+				     vgastate.o
 obj-$(CONFIG_FB_SUN3)             += sun3fb.o
 obj-$(CONFIG_FB_HGA)              += hgafb.o cfbfillrect.o cfbcopyarea.o cfbimgblt.o 
 obj-$(CONFIG_FB_SA1100)           += sa1100fb.o cfbfillrect.o cfbcopyarea.o cfbimgblt.o

drivers/video/i810/i810_main.c

@@ -1995,11 +1995,6 @@ int __init i810fb_init(void)
 		return -ENODEV;
 	i810fb_setup(option);
 
-	if (agp_intel_init()) {
-		printk("i810fb_init: cannot initialize intel agpgart\n");
-		return -ENODEV;
-	}
-
 	if (pci_register_driver(&i810fb_driver) > 0)
 		return 0;
 	pci_unregister_driver(&i810fb_driver);