* loader2/hardware.c: Remove agpgartInitialize - agpgart is

	  built statically in 2.6 (and the probe code here won't work
          now in any case...)
	* loader2/hardware.h: Likewise.
	* loader2/loader.c: Adjust accordingly.

3 files changed, 0 insertions, 48 deletions

diff --git a/loader2/hardware.c b/loader2/hardware.c
index 6af8c437c..d23493d6c 100644
--- a/loader2/hardware.c
+++ b/loader2/hardware.c
@@ -129,49 +129,6 @@ static int detectHardware(moduleInfoSet modInfo,
     return LOADER_OK;
 }
 
-int agpgartInitialize(moduleList modLoaded, moduleDeps modDeps,
-                      moduleInfoSet modInfo, int flags) {
-    struct device ** devices, *p;
-    int i;
-
-    if (FL_TESTING(flags)) return 0;
-
-    logMessage(INFO, "looking for video cards requiring agpgart module");
-    
-    devices = probeDevices(CLASS_VIDEO, BUS_UNSPEC, 0);
-    
-    if (!devices) {
-        logMessage(WARNING, "no video cards found");
-        return 0;
-    }
-
-    /* loop thru cards, see if we need agpgart */
-    for (i=0; devices[i]; i++) {
-        p = devices[i];
-        logMessage(INFO, "found video card controller %s", p->driver);
-        
-        /* HACK - need to have list of cards which match!! */
-        /* JKFIXME: verify this is really still needed */
-        if (!strcmp(p->driver, "Card:Intel 810") ||
-            !strcmp(p->driver, "Card:Intel 815")) {
-            logMessage(INFO, "found %s card requiring agpgart, loading module",
-                       p->driver+5);
-            
-            if (mlLoadModuleSetLocation("agpgart", modLoaded, modDeps, 
-					modInfo, flags, 
-					secondStageModuleLocation)) {
-                logMessage(ERROR, "failed to insert agpgart module");
-                return 1;
-            } else {
-                /* only load it once! */
-                return 0;
-            }
-        }
-    }
-    
-    return 0;
-}
-
 int scsiTapeInitialize(moduleList modLoaded, moduleDeps modDeps,
                       moduleInfoSet modInfo, int flags) {
     struct device ** devices;
diff --git a/loader2/hardware.h b/loader2/hardware.h
index 7d20172d6..1271e7f72 100644
--- a/loader2/hardware.h
+++ b/loader2/hardware.h
@@ -5,8 +5,6 @@
 
 int canProbeDevices(void);
 
-int agpgartInitialize(moduleList modLoaded, moduleDeps modDeps,
-                      moduleInfoSet modInfo, int flags);
 int scsiTapeInitialize(moduleList modLoaded, moduleDeps modDeps,
                       moduleInfoSet modInfo, int flags);
 void initializeParallelPort(moduleList modLoaded, moduleDeps modDeps,
diff --git a/loader2/loader.c b/loader2/loader.c
index 592d2104e..5177c5fe1 100644
--- a/loader2/loader.c
+++ b/loader2/loader.c
@@ -1417,9 +1417,6 @@ int main(int argc, char ** argv) {
     if (FL_UPDATES(flags)) 
         loadUpdates(flags);
 
-    /* look for cards which require the agpgart module */
-    agpgartInitialize(modLoaded, modDeps, modInfo, flags);
-
     mlLoadModuleSetLocation("md:raid0:raid1:raid5:raid6:fat:msdos:jbd:ext3:reiserfs:jfs:xfs:dm-mod:dm-zero:dm-mirror:dm-snapshot",
 			    modLoaded, modDeps, modInfo, flags, 
 			    secondStageModuleLocation);