Hi Len,
Today's linux-next merge of the acpi tree got a conflict in
drivers/pnp/Makefile between commit
ed458df4d2470adc02762a87a9ad665d0b1a2bd4 ("PnP: move pnpacpi/pnpbios_init
to after PCI init") from Linus' tree and commit
ac88a8f3f7df04774b386ddaf586040adb819b58 ("PNP: remove old
CONFIG_PNP_DEBUG option") from the acpi tree.
Really just a context problem. I fixed it up (see below).
--
Cheers,
Stephen Rothwell sfr@xxxxxxxxxxxxxxxx
http://www.canb.auug.org.au/~sfr/
diff --cc drivers/pnp/Makefile
index e83f34f,a381a92..0000000
--- a/drivers/pnp/Makefile
+++ b/drivers/pnp/Makefile
@@@ -7,10 -7,3 +7,6 @@@ obj-y := core.o card.o driver.o resour
obj-$(CONFIG_PNPACPI) += pnpacpi/
obj-$(CONFIG_PNPBIOS) += pnpbios/
obj-$(CONFIG_ISAPNP) += isapnp/
+
+# pnp_system_init goes after pnpacpi/pnpbios init
+obj-y += system.o
-
- ifeq ($(CONFIG_PNP_DEBUG),y)
- EXTRA_CFLAGS += -DDEBUG
- endif
--
To unsubscribe from this list: send the line "unsubscribe linux-next" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
