Merge branch 'pnp' into release

# Makefile for the Linux Plug-and-Play Support.

#

obj-y		:= core.o card.o driver.o resource.o manager.o support.o interface.o quirks.o

obj-y		:= pnp.o

pnp-y		:= core.o card.o driver.o resource.o manager.o support.o interface.o quirks.o

obj-$(CONFIG_PNPACPI)		+= pnpacpi/

obj-$(CONFIG_PNPBIOS)		+= pnpbios/

obj-$(CONFIG_ISAPNP)		+= isapnp/

# pnp_system_init goes after pnpacpi/pnpbios init

obj-y				+= system.o

pnp-y				+= system.o

int pnp_debug;

#if defined(CONFIG_PNP_DEBUG_MESSAGES)

static int __init pnp_debug_setup(char *__unused)

{

	pnp_debug = 1;

	return 1;

}

__setup("pnp.debug", pnp_debug_setup);

module_param_named(debug, pnp_debug, int, 0644);

#endif

#

# Makefile for the kernel ISAPNP driver.

#

obj-y			+= pnp.o

pnp-y			:= core.o compat.o

isapnp-proc-$(CONFIG_PROC_FS) = proc.o

obj-y := core.o compat.o $(isapnp-proc-y)

pnp-$(CONFIG_PROC_FS)	+= proc.o

#

# Makefile for the kernel PNPACPI driver.

#

obj-y += pnp.o

obj-y := core.o rsparser.o

pnp-y := core.o rsparser.o

#

# Makefile for the kernel PNPBIOS driver.

#

obj-y := pnp.o

pnpbios-proc-$(CONFIG_PNPBIOS_PROC_FS) = proc.o

pnp-y := core.o bioscalls.o rsparser.o

obj-y := core.o bioscalls.o rsparser.o $(pnpbios-proc-y)

pnp-$(CONFIG_PNPBIOS_PROC_FS) += proc.o