git://ftp.safe.ca / safe / jmp / linux-2.6 / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: 1e16dfc) | patch
powerpc: convert CONFIG_PPC_MERGE to CONFIG_PPC for legacy io checks
authorKumar Gala <galak@kernel.crashing.org>
Mon, 22 Sep 2008 21:41:31 +0000 (14:41 -0700)
committerKumar Gala <galak@kernel.crashing.org>
Tue, 23 Sep 2008 15:41:28 +0000 (10:41 -0500)
commit68e1ee62f0f8e556642a59ebaf0c2cc2ac6ccfa6
tree919ec52758fd0b77f8e429d1eb135835532c49c7tree | snapshot
parent1e16dfc1baa745dd89b95f6e33e4142df6218066commit | 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 | blob | history
drivers/char/ipmi/ipmi_si_intf.c diff | blob | history
drivers/i2c/busses/i2c-pca-isa.c diff | blob | history
drivers/input/serio/i8042-io.h diff | blob | history
drivers/pnp/isapnp/core.c diff | blob | history
drivers/pnp/pnpbios/core.c diff | blob | history
Full containers within linux kernel