diff options
| author | Takashi Iwai <tiwai@suse.de> | 2008-12-20 23:39:47 +0100 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2008-12-20 23:39:47 +0100 |
| commit | 55fa518867978e1f5fd8353098f80d125ac734d7 (patch) | |
| tree | 3502b331c1f9ec4cac25dc8ba30b6a0a324e350c /drivers/pnp/Makefile | |
| parent | ALSA: ca0106 MSI K8N Diamond MB spi_dac 2->1 (diff) | |
| parent | ALSA: pcsp - Fix starting the stream with HRTIMER_CB_IRQSAFE_UNLOCK (diff) | |
| download | linux-55fa518867978e1f5fd8353098f80d125ac734d7.tar.xz linux-55fa518867978e1f5fd8353098f80d125ac734d7.zip | |
Merge branch 'topic/pcsp-fix' into topic/misc
Diffstat (limited to 'drivers/pnp/Makefile')
| -rw-r--r-- | drivers/pnp/Makefile | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/drivers/pnp/Makefile b/drivers/pnp/Makefile index 26f5abc9c3f7..8de3775ec242 100644 --- a/drivers/pnp/Makefile +++ b/drivers/pnp/Makefile @@ -2,12 +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/ -ifeq ($(CONFIG_PNP_DEBUG),y) -EXTRA_CFLAGS += -DDEBUG -endif +# pnp_system_init goes after pnpacpi/pnpbios init +obj-y += system.o |