Commit 47d692a9 authored Sep 22, 2008 by Kumar Gala Committed by Jeff Garzik Sep 29, 2008

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>

parent 45fabbb7

drivers/ata/pata_sil680.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -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