Merge tag 'v3.14-rc1' into patchwork

[firefly-linux-kernel-4.4.55.git] / net / ieee802154 / Makefile

diff --git a/net/ieee802154/Makefile b/net/ieee802154/Makefile
index 951a83ee8af4fb35c8dabc459c5c2d257f452eb7..e8f05885ced6806f1139a053ee8ea4fa1b228823 100644 (file)
--- a/net/ieee802154/Makefile
+++ b/net/ieee802154/Makefile
@@ -1,5 +1,6 @@
 obj-$(CONFIG_IEEE802154) += ieee802154.o af_802154.o
-obj-$(CONFIG_IEEE802154_6LOWPAN) += 6lowpan.o 6lowpan_iphc.o
+obj-$(CONFIG_IEEE802154_6LOWPAN) += 6lowpan.o
+obj-$(CONFIG_6LOWPAN_IPHC) += 6lowpan_iphc.o
 
 ieee802154-y := netlink.o nl-mac.o nl-phy.o nl_policy.o wpan-class.o
 af_802154-y := af_ieee802154.o raw.o dgram.o