Merge branch 'linus' into test

[linux-2.6-omap-h63xx.git] / drivers / pnp / Makefile

diff --git a/drivers/pnp/Makefile b/drivers/pnp/Makefile
index a381a92fd1b65dc0ef593d9b722747c9ee54b0f0..8de3775ec2429b79ef70abe211663419eb2bc871 100644 (file)
--- a/drivers/pnp/Makefile
+++ b/drivers/pnp/Makefile
@@ -2,8 +2,11 @@
 # 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 system.o
+obj-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