diff options
author | Alexander Aring <alex.aring@gmail.com> | 2015-01-08 05:30:10 -0500 |
---|---|---|
committer | Marcel Holtmann <marcel@holtmann.org> | 2015-01-08 09:48:06 -0500 |
commit | bc6efeeeb5a2fa968532b9d666e8b7f823b1940f (patch) | |
tree | db9637b998d8730e5dc9e213c3f4f1fe4e72b522 | |
parent | 52d84ffc540cc14010c7b0d9df20063445f89187 (diff) |
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/Makefile | 2 | ||||
-rw-r--r-- | net/ieee802154/Makefile | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/net/ieee802154/6lowpan/Makefile b/net/ieee802154/6lowpan/Makefile index 2f1b75a49f4d..6bfb270a81a6 100644 --- a/net/ieee802154/6lowpan/Makefile +++ b/net/ieee802154/6lowpan/Makefile | |||
@@ -1,3 +1,3 @@ | |||
1 | obj-y += ieee802154_6lowpan.o | 1 | obj-$(CONFIG_IEEE802154_6LOWPAN) += ieee802154_6lowpan.o |
2 | 2 | ||
3 | ieee802154_6lowpan-y := core.o rx.o reassembly.o tx.o | 3 | ieee802154_6lowpan-y := core.o rx.o reassembly.o tx.o |
diff --git a/net/ieee802154/Makefile b/net/ieee802154/Makefile index 36533978b5ef..05dab2957cd4 100644 --- a/net/ieee802154/Makefile +++ b/net/ieee802154/Makefile | |||
@@ -1,6 +1,6 @@ | |||
1 | obj-$(CONFIG_IEEE802154) += ieee802154.o | 1 | obj-$(CONFIG_IEEE802154) += ieee802154.o |
2 | obj-$(CONFIG_IEEE802154_SOCKET) += ieee802154_socket.o | 2 | obj-$(CONFIG_IEEE802154_SOCKET) += ieee802154_socket.o |
3 | obj-$(CONFIG_IEEE802154_6LOWPAN) += 6lowpan/ | 3 | obj-y += 6lowpan/ |
4 | 4 | ||
5 | ieee802154-y := netlink.o nl-mac.o nl-phy.o nl_policy.o core.o \ | 5 | ieee802154-y := netlink.o nl-mac.o nl-phy.o nl_policy.o core.o \ |
6 | header_ops.o sysfs.o nl802154.o | 6 | header_ops.o sysfs.o nl802154.o |