diff --git a/[refs] b/[refs]
index 5a2d2386a423..dd3653e88474 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: b3a37f1284e05c35687522248e66dfda62924066
+refs/heads/master: 3e2990eae03c3f998f365824330290d227e4415a
diff --git a/trunk/drivers/ide/legacy/ide_platform.c b/trunk/drivers/ide/legacy/ide_platform.c
index ffa57c1175d0..bf240775531e 100644
--- a/trunk/drivers/ide/legacy/ide_platform.c
+++ b/trunk/drivers/ide/legacy/ide_platform.c
@@ -100,11 +100,10 @@ static int __devinit plat_ide_probe(struct platform_device *pdev)
 	hw.dev = &pdev->dev;
 
 	ide_init_port_hw(hwif, &hw);
+	hwif->mmio = 1;
 
-	if (mmio) {
-		hwif->mmio = 1;
+	if (mmio)
 		default_hwif_mmiops(hwif);
-	}
 
 	idx[0] = hwif->index;