3 files changed, 2 insertions, 17 deletions

diff --git a/drivers/ide/pci/Makefile b/drivers/ide/pci/Makefile
index 94803253e8af..02e6ee7d751d 100644
--- a/drivers/ide/pci/Makefile
+++ b/drivers/ide/pci/Makefile
@@ -34,7 +34,8 @@ obj-$(CONFIG_BLK_DEV_TRM290)		+= trm290.o
 obj-$(CONFIG_BLK_DEV_VIA82CXXX)         += via82cxxx.o
 
 # Must appear at the end of the block
-obj-$(CONFIG_BLK_DEV_GENERIC)          += generic.o
+obj-$(CONFIG_BLK_DEV_GENERIC)           += ide-pci-generic.o
+ide-pci-generic-y                       += generic.o
 
 ifeq ($(CONFIG_BLK_DEV_CMD640), m)
         obj-m += cmd640.o
diff --git a/drivers/ide/pci/generic.c b/drivers/ide/pci/generic.c
index 9262a9174b4e..7fd83a9d4dee 100644
--- a/drivers/ide/pci/generic.c
+++ b/drivers/ide/pci/generic.c
@@ -29,19 +29,6 @@
 
 static int ide_generic_all;             /* Set to claim all devices */
 
-/*
- * the module_param_named() was added for the modular case
- * the __setup() is left as compatibility for existing setups
- */
-#ifndef MODULE
-static int __init ide_generic_all_on(char *unused)
-{
-        ide_generic_all = 1;
-        printk(KERN_INFO "IDE generic will claim all unknown PCI IDE storage controllers.\n");
-        return 1;
-}
-const __setup("all-generic-ide", ide_generic_all_on);
-#endif
 module_param_named(all_generic_ide, ide_generic_all, bool, 0444);
 MODULE_PARM_DESC(all_generic_ide, "IDE generic will claim all unknown PCI IDE storage controllers.");
 
diff --git a/drivers/ide/pci/siimage.c b/drivers/ide/pci/siimage.c
index ef5b39fa042b..cc4be9621bc0 100644
--- a/drivers/ide/pci/siimage.c
+++ b/drivers/ide/pci/siimage.c
@@ -704,9 +704,6 @@ static void __devinit init_mmio_iops_siimage(ide_hwif_t *hwif)
                 hwif->sata_scr[SATA_STATUS_OFFSET]      = base + 0x104;
                 hwif->sata_scr[SATA_ERROR_OFFSET]       = base + 0x108;
                 hwif->sata_scr[SATA_CONTROL_OFFSET]     = base + 0x100;
-                hwif->sata_misc[SATA_MISC_OFFSET]       = base + 0x140;
-                hwif->sata_misc[SATA_PHY_OFFSET]        = base + 0x144;
-                hwif->sata_misc[SATA_IEN_OFFSET]        = base + 0x148;
         }
 
         memcpy(hwif->io_ports, hw.io_ports, sizeof(hwif->io_ports));