From c0ac3ef1a23cb4e9ded13462466366eec36587e5 Mon Sep 17 00:00:00 2001
From: Kumar Gala <galak@kernel.crashing.org>
Date: Mon, 22 Sep 2008 14:47:33 -0700
Subject: [PATCH] --- yaml --- r: 110260 b: refs/heads/master c:
 47d692a946f12c299c21536fff6b39369311f002 h: refs/heads/master v: v3

---
 [refs]                          | 2 +-
 trunk/drivers/ata/pata_sil680.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 64ce3a90c3de..d791960375e5 100644
--- 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
index e970b227fbce..a598bb36aafc 100644
--- 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