Merge branch 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tytso/ext4

[linux-2.6] / drivers / ide / legacy / ide-4drives.c

diff --git a/drivers/ide/legacy/ide-4drives.c b/drivers/ide/legacy/ide-4drives.c
index e69566284ab7b70263d8564c100e1f889e70a741..ecae916a3385f15c8725199a3eb18fe3733a79e4 100644 (file)
--- a/drivers/ide/legacy/ide-4drives.c
+++ b/drivers/ide/legacy/ide-4drives.c
@@ -6,7 +6,7 @@
 
 #define DRV_NAME "ide-4drives"
 
-int probe_4drives;
+static int probe_4drives;
 
 module_param_named(probe, probe_4drives, bool, 0);
 MODULE_PARM_DESC(probe, "probe for generic IDE chipset with 4 drives/port");
@@ -43,7 +43,6 @@ static int __init ide_4drives_init(void)
        hwif = ide_find_port();
        if (hwif) {
                ide_init_port_hw(hwif, &hw);
-               hwif->mmio = 1;
                idx[0] = hwif->index;
        }
 
@@ -52,7 +51,6 @@ static int __init ide_4drives_init(void)
                ide_init_port_hw(mate, &hw);
                mate->drives[0].select.all ^= 0x20;
                mate->drives[1].select.all ^= 0x20;
-               mate->mmio = 1;
                idx[1] = mate->index;
 
                if (hwif) {