projects
/
linux-2.6-block.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge tag 'mvebu-fixes-3.13-2' of git://git.infradead.org/linux-mvebu into fixes
[linux-2.6-block.git]
/
net
/
Makefile
diff --git
a/net/Makefile
b/net/Makefile
index 8fa2f91517f1b541094f9f46c6cc8173b1c7ea93..cbbbe6d657caf15e670c46b8999872bf360ac801 100644
(file)
--- a/
net/Makefile
+++ b/
net/Makefile
@@
-57,7
+57,7
@@
obj-$(CONFIG_CAIF) += caif/
ifneq ($(CONFIG_DCB),)
obj-y += dcb/
endif
-obj-
$(CONFIG_IEEE802154)
+= ieee802154/
+obj-
y
+= ieee802154/
obj-$(CONFIG_MAC802154) += mac802154/
ifeq ($(CONFIG_NET),y)