Kumar Gala 47d692a946 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>
2008-09-29 00:28:02 -04:00
..
2008-05-06 11:43:44 -04:00
2008-09-29 00:25:28 -04:00
2008-05-06 11:33:58 -04:00
2008-07-31 01:38:19 -04:00
2008-05-19 17:30:32 -04:00
2008-04-17 15:44:21 -04:00
2008-04-17 15:44:21 -04:00
2008-04-17 15:44:22 -04:00
2008-04-17 15:44:21 -04:00
2008-04-17 15:44:21 -04:00
2008-04-17 15:44:21 -04:00
2008-05-19 17:30:32 -04:00
2008-04-17 15:44:21 -04:00
2008-04-17 15:44:21 -04:00
2008-04-17 15:44:21 -04:00
2008-04-17 15:44:21 -04:00
2008-04-17 15:44:21 -04:00
2008-04-17 15:44:21 -04:00
2008-04-17 15:44:21 -04:00
2008-04-17 15:44:21 -04:00
2008-04-17 15:44:21 -04:00
2008-04-17 15:44:21 -04:00
2008-04-17 15:44:22 -04:00
2008-05-19 17:30:32 -04:00
2008-05-19 17:30:32 -04:00
2008-04-17 15:44:21 -04:00
2008-04-17 15:44:21 -04:00
2008-06-20 20:53:34 +02:00
2008-04-17 15:44:21 -04:00
2008-04-17 15:44:21 -04:00
2008-04-17 15:44:21 -04:00
2008-05-06 11:33:58 -04:00
2008-04-17 15:44:21 -04:00
2008-04-17 15:44:21 -04:00
2008-09-29 00:22:28 -04:00
2008-09-29 00:22:28 -04:00
2008-01-23 05:24:15 -05:00
2007-07-02 10:17:42 -04:00