summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAlexander Aring <alex.aring@gmail.com>2015-01-08 11:30:10 +0100
committerMarcel Holtmann <marcel@holtmann.org>2015-01-08 15:48:06 +0100
commitbc6efeeeb5a2fa968532b9d666e8b7f823b1940f (patch)
treedb9637b998d8730e5dc9e213c3f4f1fe4e72b522
parent52d84ffc540cc14010c7b0d9df20063445f89187 (diff)
downloadop-kernel-dev-bc6efeeeb5a2fa968532b9d666e8b7f823b1940f.zip
op-kernel-dev-bc6efeeeb5a2fa968532b9d666e8b7f823b1940f.tar.gz
ieee802154: 6lowpan: fix Makefile entry
Since commit ea81ac2e7050798109356150ea16e71622a5c329 ("ieee802154: create 6lowpan sub-directory") we have a subdirectory for the ieee802154 6lowpan implementation. This commit also moves the Kconfig entry inside of net/ieee802154/6lowpan/ and forgot to rename the Makefile entry from obj-$(CONFIG_IEEE802154_6LOWPAN) to obj-y and handle the obj-$(CONFIG_IEEE802154_6LOWPAN) inside the created 6lowpan directory. This will occur that the ieee802154_6lowpan can't be build. Signed-off-by: Alexander Aring <alex.aring@gmail.com> Signed-off-by: Marcel Holtmann <marcel@holtmann.org>
-rw-r--r--net/ieee802154/6lowpan/Makefile2
-rw-r--r--net/ieee802154/Makefile2
2 files changed, 2 insertions, 2 deletions
diff --git a/net/ieee802154/6lowpan/Makefile b/net/ieee802154/6lowpan/Makefile
index 2f1b75a..6bfb270 100644
--- a/net/ieee802154/6lowpan/Makefile
+++ b/net/ieee802154/6lowpan/Makefile
@@ -1,3 +1,3 @@
-obj-y += ieee802154_6lowpan.o
+obj-$(CONFIG_IEEE802154_6LOWPAN) += ieee802154_6lowpan.o
ieee802154_6lowpan-y := core.o rx.o reassembly.o tx.o
diff --git a/net/ieee802154/Makefile b/net/ieee802154/Makefile
index 3653397..05dab29 100644
--- a/net/ieee802154/Makefile
+++ b/net/ieee802154/Makefile
@@ -1,6 +1,6 @@
obj-$(CONFIG_IEEE802154) += ieee802154.o
obj-$(CONFIG_IEEE802154_SOCKET) += ieee802154_socket.o
-obj-$(CONFIG_IEEE802154_6LOWPAN) += 6lowpan/
+obj-y += 6lowpan/
ieee802154-y := netlink.o nl-mac.o nl-phy.o nl_policy.o core.o \
header_ops.o sysfs.o nl802154.o
OpenPOWER on IntegriCloud