X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=drivers%2Fide%2Fide-pnp.c;h=df7d1504f84ef0d4d32058e42d82e93f653f7a5a;hb=987b0145d94eecf292d8b301228356f44611ab7c;hp=c3f0640d9f22cb21e31093ed1c6ee63cbccaec2a;hpb=ec9397bab20a628530ce3051167d3d0fcc2c1af7;p=linux-2.6.git

diff --git a/drivers/ide/ide-pnp.c b/drivers/ide/ide-pnp.c
index c3f0640d9..df7d1504f 100644
--- a/drivers/ide/ide-pnp.c
+++ b/drivers/ide/ide-pnp.c
@@ -21,7 +21,7 @@
 #include <linux/ide.h>
 
 /* Add your devices here :)) */
-struct pnp_device_id idepnp_devices[] = {
+static struct pnp_device_id idepnp_devices[] = {
   	/* Generic ESDI/IDE/ATA compatible hard disk controller */
 	{.id = "PNP0600", .driver_data = 0},
 	{.id = ""}
@@ -57,7 +57,7 @@ static void idepnp_remove(struct pnp_dev * dev)
 {
 	ide_hwif_t *hwif = pnp_get_drvdata(dev);
 	if (hwif) {
-		ide_unregister_hwif(hwif);
+		ide_unregister(hwif->index);
 	} else
 		printk(KERN_ERR "idepnp: Unable to remove device, please report.\n");
 }