projects / platform / kernel / linux-rpi.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: 45fabbb) | patch
pata_sil680: convert CONFIG_PPC_MERGE to CONFIG_PPC
authorKumar Gala <galak@kernel.crashing.org>
Mon, 22 Sep 2008 21:47:33 +0000 (14:47 -0700)
committerJeff Garzik <jgarzik@redhat.com>
Mon, 29 Sep 2008 04:28:02 +0000 (00:28 -0400)
commit47d692a946f12c299c21536fff6b39369311f002
tree6b104571f6b351155a20f6d1d79da7244a3ea3eetree | snapshot
parent45fabbb77bd95adff7a80bde1c7a0ace1075fde6commit | diff
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>
drivers/ata/pata_sil680.c diff | blob | history
Domain: System / Kernel;