From e069777599c54ece79faa4cd8007e64373c6e9c3 Mon Sep 17 00:00:00 2001
From: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>
Date: Fri, 25 Jan 2008 22:17:07 +0100
Subject: [PATCH] --- yaml --- r: 76219 b: refs/heads/master c:
 d26805fd025abe1ab8785b23a7942cfb6ceffd75 h: refs/heads/master i:   76217:
 8b303da9669f7f4a24c844ef14e9c2198a212ede   76215:
 168a911e9ece01b22949517a0a6041442b0e378e v: v3

---
 [refs]                       | 2 +-
 trunk/drivers/ide/ppc/pmac.c | 9 ++-------
 2 files changed, 3 insertions(+), 8 deletions(-)

diff --git a/[refs] b/[refs]
index cd179ca4bc70..93590cb57d64 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 74095a91ed02f6727b62d4416be00a041f2d7436
+refs/heads/master: d26805fd025abe1ab8785b23a7942cfb6ceffd75
diff --git a/trunk/drivers/ide/ppc/pmac.c b/trunk/drivers/ide/ppc/pmac.c
index 7f7a59885777..4559e29446e9 100644
--- a/trunk/drivers/ide/ppc/pmac.c
+++ b/trunk/drivers/ide/ppc/pmac.c
@@ -438,13 +438,8 @@ pmac_ide_init_hwif_ports(hw_regs_t *hw,
 		if (data_port == pmac_ide[ix].regbase)
 			break;
 
-	if (ix >= MAX_HWIFS) {
-		/* Probably a PCI interface... */
-		for (i = IDE_DATA_OFFSET; i <= IDE_STATUS_OFFSET; ++i)
-			hw->io_ports[i] = data_port + i - IDE_DATA_OFFSET;
-		hw->io_ports[IDE_CONTROL_OFFSET] = ctrl_port;
-		return;
-	}
+	if (ix >= MAX_HWIFS)
+		return;		/* not an IDE PMAC interface */
 
 	for (i = 0; i < 8; ++i)
 		hw->io_ports[i] = data_port + i * 0x10;