diff options
| author | Benjamin Herrenschmidt <benh@ozlabs.org> | 2008-04-08 17:51:07 -0400 |
|---|---|---|
| committer | Jeff Garzik <jeff@garzik.org> | 2008-04-09 01:06:33 -0400 |
| commit | 119b3aa65d33533c2f8d8822bb7a3e62aa12f860 (patch) | |
| tree | 84aae81374affcbbfae3288ba90e9059b8bed5c0 /drivers | |
| parent | 7180c4c9e09888db0a188f729c96c6d7bd61fa83 (diff) | |
pata_sil680: Fix build on arch/ppc
Commit 0f436eff54f90419ac1b8accfb3e6e17c4b49a4e breaks build on
arch/ppc as it doesn't implement the machine_is() macro.
This fixes it by using CONFIG_PPC_MERGE instead which represents
arch/powerpc only, while CONFIG_PPC is set for both.
Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Signed-off-by: Jeff Garzik <jeff@garzik.org>
Diffstat (limited to 'drivers')
| -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 |