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
..
ipmi_bt_sm.c	IPMI: Style fixes in the system interface code	2008-04-29 08:06:15 -07:00
ipmi_devintf.c	device create: char: convert device_create to device_create_drvdata	2008-07-21 21:54:41 -07:00
ipmi_kcs_sm.c	IPMI: Style fixes in the system interface code	2008-04-29 08:06:15 -07:00
ipmi_msghandler.c	ipmi: make alloc_recv_msg static	2008-04-29 08:06:15 -07:00
ipmi_poweroff.c	ipmi: fix return from atca_oem_poweroff_hook	2008-04-29 08:06:16 -07:00
ipmi_si_intf.c	powerpc: convert CONFIG_PPC_MERGE to CONFIG_PPC for legacy io checks	2008-09-23 10:41:28 -05:00
ipmi_si_sm.h	IPMI: Style fixes in the system interface code	2008-04-29 08:06:15 -07:00
ipmi_smic_sm.c	IPMI: Style fixes in the system interface code	2008-04-29 08:06:15 -07:00
ipmi_watchdog.c	Merge commit 'v2.6.26' into bkl-removal	2008-07-14 15:29:34 -06:00
Kconfig	Use menuconfig objects II - IPMI	2007-07-16 09:05:40 -07:00
Makefile	ipmi: remove unused target and action in Makefile	2008-04-29 08:06:15 -07:00