Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 803711af authored by Thomas Renninger's avatar Thomas Renninger Committed by Len Brown
Browse files

PNP: Compile all pnp built-in stuff in one module namespace 



This is cleanup mostly, nothing urgent.
I came up with it when looking at dynamic debug which can
enable pr_debug messages at runtime or boot param
for a specific module.

Advantages:
  - Any pnp code can make use of the moduleparam.h interface, the modules
    will show up as pnp.param.
  - Passing pnp.ddebug as kernel boot param will enable all pnp debug messages
    with my previous patch and CONFIG_DYNAMIC_DEBUG enabled.

Signed-off-by: default avatarThomas Renninger <trenn@suse.de>
Signed-off-by: default avatarBjorn Helgaas <bjorn.helgaas@hp.com>
Signed-off-by: default avatarLen Brown <len.brown@intel.com>
parent 45352bbf

drivers/pnp/Makefile

+4 −2
Original line number Diff line number Diff line
@@ -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

drivers/pnp/isapnp/Makefile

+3 −3
Original line number Diff line number Diff line 
#

# 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

drivers/pnp/pnpacpi/Makefile

+2 −1
Original line number Diff line number Diff line 
#

# Makefile for the kernel PNPACPI driver.

#

obj-y += pnp.o



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

drivers/pnp/pnpbios/Makefile

+3 −2
Original line number Diff line number Diff line 
#

# 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