[PATCH] fbdev: Remove i810fb explicit agp initialization hack.

When Antonino A.  Daplas posted his "fbdev: Initialize i810fb after
agpgart" patch he said that the ugly agp initialization hack for intel agp
shouldn't be needed but that he couldn't test it.

I have tested the framebuffer updates and additionally removed the
initialization hack and it does indeed work.

Signed-off-by: Andreas Henriksson <andreas@fjortis.info>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

diff --git a/drivers/char/agp/intel-agp.c b/drivers/char/agp/intel-agp.c
index 7bec505ad95eeaa37ea60f38a3c1a45554a3f354..b7b3c561775649671da9b020923e7670b5c8004b 100644 (file)
--- a/drivers/char/agp/intel-agp.c
+++ b/drivers/char/agp/intel-agp.c
@@ -1782,16 +1782,8 @@ static struct pci_driver agp_intel_pci_driver = {
        .resume         = agp_intel_resume,
 };
 
-/* intel_agp_init() must not be declared static for explicit
-   early initialization to work (ie i810fb) */
-int __init agp_intel_init(void)
+static int __init agp_intel_init(void)
 {
-       static int agp_initialised=0;
-
-       if (agp_initialised == 1)
-               return 0;
-       agp_initialised=1;
-
        return pci_module_init(&agp_intel_pci_driver);
 }