summaryrefslogtreecommitdiffstats
path: root/drivers/pnp/pnpacpi
diff options
context:
space:
mode:
authorLen Brown <len.brown@intel.com>2011-01-12 10:59:44 +0100
committerLen Brown <len.brown@intel.com>2011-01-12 10:59:44 +0100
commit6d1f23f204c9e4638bd30ff3a768c47e40cd3ac0 (patch)
tree5b0ddc0eb897435f9fade4c4b5927f777ca23707 /drivers/pnp/pnpacpi
parentMerge branch 'bugzilla-15100' into release (diff)
parentPNP: Set up pnp_debug via module and not via boot param. (diff)
downloadlinux-6d1f23f204c9e4638bd30ff3a768c47e40cd3ac0.tar.xz
linux-6d1f23f204c9e4638bd30ff3a768c47e40cd3ac0.zip
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 905326fcca85..40c93da18252 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