---

yaml --- r: 110260 b: refs/heads/master c: 47d692a h: refs/heads/master v: v3
git-mirror · Sep 29, 2008 · c0ac3ef · c0ac3ef
1 parent e5e7623
commit c0ac3ef
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 45fabbb77bd95adff7a80bde1c7a0ace1075fde6
+refs/heads/master: 47d692a946f12c299c21536fff6b39369311f002
diff --git a/trunk/drivers/ata/pata_sil680.c b/trunk/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