Piteball/android_kernel_samsung_msm8976
1
1
Fork 0
mirror of https://github.com/team-infusion-developers/android_kernel_samsung_msm8976.git synced 2024-11-07 04:09:21 +00:00
Code Issues Projects Releases Wiki Activity

Merge branch 'pnp' into release

Browse source
This commit is contained in:
Len Brown 2011-01-12 04:59:44 -05:00
commit 6d1f23f204
5 changed files with 13 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
drivers/pnp/Makefile
View file

@ -2,11 +2,13 @@
# 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

7
drivers/pnp/core.c
View file

@ -220,10 +220,5 @@ subsys_initcall(pnp_init);
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

6
drivers/pnp/isapnp/Makefile
View file

@ -1,7 +1,7 @@
#
# 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

3
drivers/pnp/pnpacpi/Makefile
View file

@ -1,5 +1,6 @@
#
# Makefile for the kernel PNPACPI driver.
#
obj-y += pnp.o
obj-y := core.o rsparser.o
pnp-y := core.o rsparser.o

5
drivers/pnp/pnpbios/Makefile
View file

@ -1,7 +1,8 @@
#
# 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