diff options
-rw-r--r-- | drivers/ata/pata_sil680.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/ata/pata_sil680.c b/drivers/ata/pata_sil680.c index 3988e44f4934..7c5b2dd9a1a1 100644 --- a/drivers/ata/pata_sil680.c +++ b/drivers/ata/pata_sil680.c | |||
@@ -270,7 +270,7 @@ static u8 sil680_init_chip(struct pci_dev *pdev, int *try_mmio) | |||
270 | tmpbyte & 1, tmpbyte & 0x30); | 270 | tmpbyte & 1, tmpbyte & 0x30); |
271 | 271 | ||
272 | *try_mmio = 0; | 272 | *try_mmio = 0; |
273 | #ifdef CONFIG_PPC | 273 | #ifdef CONFIG_PPC_MERGE |
274 | if (machine_is(cell)) | 274 | if (machine_is(cell)) |
275 | *try_mmio = (tmpbyte & 1) || pci_resource_start(pdev, 5); | 275 | *try_mmio = (tmpbyte & 1) || pci_resource_start(pdev, 5); |
276 | #endif | 276 | #endif |