68e1ee62f0f8e556642a59ebaf0c2cc2ac6ccfa6 - kernel/msm

commit	68e1ee62f0f8e556642a59ebaf0c2cc2ac6ccfa6	[log] [tgz]
author	Kumar Gala <galak@kernel.crashing.org>	Mon Sep 22 14:41:31 2008 -0700
committer	Kumar Gala <galak@kernel.crashing.org>	Tue Sep 23 10:41:28 2008 -0500
tree	919ec52758fd0b77f8e429d1eb135835532c49c7
parent	1e16dfc1baa745dd89b95f6e33e4142df6218066 [diff]

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>

drivers/block/floppy.c[diff]
drivers/char/ipmi/ipmi_si_intf.c[diff]
drivers/i2c/busses/i2c-pca-isa.c[diff]
drivers/input/serio/i8042-io.h[diff]
drivers/pnp/isapnp/core.c[diff]
drivers/pnp/pnpbios/core.c[diff]

6 files changed

tree: 919ec52758fd0b77f8e429d1eb135835532c49c7