Kumar Gala 0327457221 rtc: use CONFIG_PPC instead of CONFIG_PPC_MERGE
Now that arch/ppc is dead CONFIG_PPC_MERGE is always defined for all
powerpc platforms and we want to get rid of it 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: David Brownell <david-b@pacbell.net>
Cc: Alessandro Zummo <a.zummo@towertech.it>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
2008-10-16 11:21:40 -07:00
..
2008-10-15 11:31:54 +11:00
2008-10-15 11:31:54 +11:00
2008-10-16 11:21:38 -07:00
2008-10-13 21:51:57 +01:00
2008-10-16 11:21:30 -07:00
2008-10-14 10:11:27 +11:00
2008-10-15 11:31:54 +11:00
2008-10-15 11:31:54 +11:00
2008-10-14 10:23:27 -07:00
2008-10-15 11:31:54 +11:00
2008-10-03 10:04:10 +02:00