Merge master.kernel.org:/home/rmk/linux-2.6-arm

[linux-2.6] / drivers / ata / pata_isapnp.c

diff --git a/drivers/ata/pata_isapnp.c b/drivers/ata/pata_isapnp.c
index 1f647b648204fffa172d761677f43bb0367572c3..91a396fa5b20f0f75fdbc550ab6d1b9654738145 100644 (file)
--- a/drivers/ata/pata_isapnp.c
+++ b/drivers/ata/pata_isapnp.c
@@ -77,7 +77,6 @@ static int isapnp_init_one(struct pnp_dev *idev, const struct pnp_device_id *dev
        struct ata_host *host;
        struct ata_port *ap;
        void __iomem *cmd_addr, *ctl_addr;
-       int rc;
 
        if (pnp_port_valid(idev, 0) == 0)
                return -ENODEV;
@@ -140,6 +139,8 @@ static struct pnp_device_id isapnp_devices[] = {
        {.id = ""}
 };
 
+MODULE_DEVICE_TABLE(pnp, isapnp_devices);
+
 static struct pnp_driver isapnp_driver = {
        .name           = DRV_NAME,
        .id_table       = isapnp_devices,