diff options
| author | Kumar Gala <galak@kernel.crashing.org> | 2008-09-22 14:47:33 -0700 |
|---|---|---|
| committer | Jeff Garzik <jgarzik@redhat.com> | 2008-09-29 00:28:02 -0400 |
| commit | 47d692a946f12c299c21536fff6b39369311f002 (patch) | |
| tree | 6b104571f6b351155a20f6d1d79da7244a3ea3ee /drivers/ata | |
| parent | 45fabbb77bd95adff7a80bde1c7a0ace1075fde6 (diff) | |
| download | blackbird-op-linux-47d692a946f12c299c21536fff6b39369311f002.tar.gz blackbird-op-linux-47d692a946f12c299c21536fff6b39369311f002.zip | |
pata_sil680: convert CONFIG_PPC_MERGE to CONFIG_PPC
Now that arch/ppc is dead CONFIG_PPC_MERGE is always defined for all
powerpc platforms and we want to get rid of CONFIG_PPC_MERGE use
CONFIG_PPC instead.
Signed-off-by: Kumar Gala <galak@kernel.crashing.org>
Cc: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Cc: Paul Mackerras <paulus@samba.org>
Cc: Alan Cox <alan@lxorguk.ukuu.org.uk>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Jeff Garzik <jgarzik@redhat.com>
Diffstat (limited to 'drivers/ata')
| -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 e970b227fbce..a598bb36aafc 100644 --- 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 |
