diff options
author | Len Brown <len.brown@intel.com> | 2011-01-12 04:59:44 -0500 |
---|---|---|
committer | Len Brown <len.brown@intel.com> | 2011-01-12 04:59:44 -0500 |
commit | 6d1f23f204c9e4638bd30ff3a768c47e40cd3ac0 (patch) | |
tree | 5b0ddc0eb897435f9fade4c4b5927f777ca23707 /drivers/pnp/Makefile | |
parent | 633379a0f9f16362835d7a3fde141d3a95fd6c97 (diff) | |
parent | cdefba03e44bd3b3311a3849a81ec7030dfa1519 (diff) |
Merge branch 'pnp' into release
Diffstat (limited to 'drivers/pnp/Makefile')
-rw-r--r-- | drivers/pnp/Makefile | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/drivers/pnp/Makefile b/drivers/pnp/Makefile index 8de3775ec24..bfba893cb32 100644 --- a/drivers/pnp/Makefile +++ b/drivers/pnp/Makefile @@ -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 |