68e1ee62f0
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> |
||
---|---|---|
.. | ||
ipmi_bt_sm.c | ||
ipmi_devintf.c | ||
ipmi_kcs_sm.c | ||
ipmi_msghandler.c | ||
ipmi_poweroff.c | ||
ipmi_si_intf.c | ||
ipmi_si_sm.h | ||
ipmi_smic_sm.c | ||
ipmi_watchdog.c | ||
Kconfig | ||
Makefile |