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
..
isapnp	powerpc: convert CONFIG_PPC_MERGE to CONFIG_PPC for legacy io checks	2008-09-23 10:41:28 -05:00
pnpacpi	PNPACPI: ignore the producer/consumer bit for extended IRQ descriptors	2008-08-25 12:04:44 +02:00
pnpbios	powerpc: convert CONFIG_PPC_MERGE to CONFIG_PPC for legacy io checks	2008-09-23 10:41:28 -05:00
base.h	make pnp_add_card_id() static	2008-07-26 12:00:11 -07:00
card.c	make pnp_add_card_id() static	2008-07-26 12:00:11 -07:00
core.c	PNP: convert resource options to single linked list	2008-07-16 23:27:07 +02:00
driver.c	PNP: change pnp_add_id() to allocate its own pnp_id structures	2008-04-29 03:22:16 -04:00
interface.c	PNP: convert resource options to single linked list	2008-07-16 23:27:07 +02:00
Kconfig	Use menuconfig objects: PNP	2007-07-16 09:05:40 -07:00
Makefile	PNP: use dev_info(), dev_err(), etc in core	2007-10-17 08:43:04 -07:00
manager.c	PNP: convert resource options to single linked list	2008-07-16 23:27:07 +02:00
quirks.c	pnp: have quirk_system_pci_resources() include io resources	2008-07-26 12:00:02 -07:00
resource.c	PNP: avoid legacy IDE IRQs	2008-07-16 23:27:07 +02:00
support.c	PNP: fix formatting of dbg_pnp_show_resources() output	2008-08-01 12:46:41 -07:00
system.c	PNP: replace pnp_resource_table with dynamically allocated resources	2008-07-16 23:27:05 +02:00