BackPup/Linux
1
0 Fork 0
mirror of https://github.com/torvalds/linux.git synced 2026-10-07 05:31:08 -04:00
Code Issues Packages Projects Releases Wiki Activity

pata_sil680: Fix build on arch/ppc

Browse Source 
Commit 0f436eff54 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 <[email protected]>
Signed-off-by: Jeff Garzik <[email protected]>
This commit is contained in:
Benjamin Herrenschmidt authored and Jeff Garzik committed 2008-04-09 01:06:33 -04:00
1 parent 7180c4c9e0
commit 119b3aa65d
1 file changed
+1 -1
Download Patch File Download Diff File Expand all files Collapse all files
drivers/ata/pata_sil680.c
+1 -1
View File
@@ -270,7 +270,7 @@ static u8 sil680_init_chip(struct pci_dev *pdev, int *try_mmio)
tmpbyte & 1, tmpbyte & 0x30);
*try_mmio = 0;
#ifdef CONFIG_PPC
#ifdef CONFIG_PPC_MERGE
if (machine_is(cell))
*try_mmio = (tmpbyte & 1) || pci_resource_start(pdev, 5);
#endif