X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=drivers%2Fide%2Fide-generic.c;h=9ebec08eefd92258e66c88602c965a953ded4114;hb=b881502666783b2d9ca2fc7a056d0f773073a808;hp=99fd56151131cb4fc92b9f2e9da5091811a37483;hpb=1da177e4c3f41524e886b7f1b8a0c1fc7321cac2;p=linux-2.6

diff --git a/drivers/ide/ide-generic.c b/drivers/ide/ide-generic.c
index 99fd561511..9ebec08eef 100644
--- a/drivers/ide/ide-generic.c
+++ b/drivers/ide/ide-generic.c
@@ -14,15 +14,19 @@
 
 static int __init ide_generic_init(void)
 {
-	if (ide_hwifs[0].io_ports[IDE_DATA_OFFSET])
-		ide_get_lock(NULL, NULL); /* for atari only */
+	u8 idx[MAX_HWIFS];
+	int i;
 
-	(void)ideprobe_init();
+	for (i = 0; i < MAX_HWIFS; i++) {
+		ide_hwif_t *hwif = &ide_hwifs[i];
 
-	if (ide_hwifs[0].io_ports[IDE_DATA_OFFSET])
-		ide_release_lock();	/* for atari only */
+		if (hwif->io_ports[IDE_DATA_OFFSET] && !hwif->present)
+			idx[i] = i;
+		else
+			idx[i] = 0xff;
+	}
 
-	create_proc_ide_interfaces();
+	ide_device_add_all(idx, NULL);
 
 	return 0;
 }