projects
/
cascardo
/
linux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'core-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel...
[cascardo/linux.git]
/
drivers
/
ata
/
pata_sil680.c
diff --git
a/drivers/ata/pata_sil680.c
b/drivers/ata/pata_sil680.c
index
e970b22
..
a598bb3
100644
(file)
--- a/
drivers/ata/pata_sil680.c
+++ b/
drivers/ata/pata_sil680.c
@@
-230,7
+230,7
@@
static u8 sil680_init_chip(struct pci_dev *pdev, int *try_mmio)
tmpbyte & 1, tmpbyte & 0x30);
*try_mmio = 0;
-#ifdef CONFIG_PPC
_MERGE
+#ifdef CONFIG_PPC
if (machine_is(cell))
*try_mmio = (tmpbyte & 1) || pci_resource_start(pdev, 5);
#endif