summaryrefslogtreecommitdiffstats
path: root/drivers/pnp/pnpacpi
diff options
context:
space:
mode:
authorLen Brown <len.brown@intel.com>2011-01-12 04:59:44 -0500
committerLen Brown <len.brown@intel.com>2011-01-12 04:59:44 -0500
commit6d1f23f204c9e4638bd30ff3a768c47e40cd3ac0 (patch)
tree5b0ddc0eb897435f9fade4c4b5927f777ca23707 /drivers/pnp/pnpacpi
parent633379a0f9f16362835d7a3fde141d3a95fd6c97 (diff)
parentcdefba03e44bd3b3311a3849a81ec7030dfa1519 (diff)
Merge branch 'pnp' into release
Diffstat (limited to 'drivers/pnp/pnpacpi')
-rw-r--r--drivers/pnp/pnpacpi/Makefile3
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/pnp/pnpacpi/Makefile b/drivers/pnp/pnpacpi/Makefile
index 905326fcca8..40c93da1825 100644
--- a/drivers/pnp/pnpacpi/Makefile
+++ b/drivers/pnp/pnpacpi/Makefile
@@ -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