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
..
bioscalls.c	PNPBIOS: remove include/linux/pnpbios.h	2008-04-29 03:22:30 -04:00
core.c	powerpc: convert CONFIG_PPC_MERGE to CONFIG_PPC for legacy io checks	2008-09-23 10:41:28 -05:00
Kconfig	Use menuconfig objects: PNP	2007-07-16 09:05:40 -07:00
Makefile	PNP: turn on -DDEBUG when CONFIG_PNP_DEBUG is set	2008-04-29 03:22:14 -04:00
pnpbios.h	PNPBIOS: remove include/linux/pnpbios.h	2008-04-29 03:22:30 -04:00
proc.c	Merge branch 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux-acpi-2.6	2008-04-30 11:52:52 -07:00
rsparser.c	PNP: convert resource options to single linked list	2008-07-16 23:27:07 +02:00