Kumar Gala 68e1ee62f0 powerpc: convert CONFIG_PPC_MERGE to CONFIG_PPC for legacy io checks
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>
Acked-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Cc: Paul Mackerras <paulus@samba.org>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Kumar Gala <galak@kernel.crashing.org>
2008-09-23 10:41:28 -05:00
..
2008-07-24 10:47:41 -07:00
2008-08-18 21:40:04 +02:00
2008-08-19 18:47:56 +02:00
2008-07-25 10:53:30 -07:00
2008-08-26 00:19:28 +10:00
2008-09-05 14:39:37 -07:00
2008-07-26 12:00:11 -07:00
2008-09-10 11:36:13 +10:00
2008-08-16 16:35:33 +01:00
2008-09-02 19:21:40 -07:00
2008-08-04 12:51:06 +09:00
2008-08-13 17:33:00 -07:00