diff options
| author | David S. Miller <davem@davemloft.net> | 2011-09-21 20:44:50 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2011-09-21 20:44:50 -0400 |
| commit | b7a17c0d846aab9f0e5d1dd3d005152c4ce459aa (patch) | |
| tree | 0edaae4e84b8f98ea98316581d61f6dc73ce6bba /net/batman-adv/Makefile | |
| parent | 38034518c086fc48232b641cab97396a615864d0 (diff) | |
| parent | ce43aa6c142d69820a267431ea342d1bd9f6d3ce (diff) | |
Merge branch 'master' of github.com:davem330/net-next
Diffstat (limited to 'net/batman-adv/Makefile')
| -rw-r--r-- | net/batman-adv/Makefile | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/batman-adv/Makefile b/net/batman-adv/Makefile index 2de93d00631b..ce6861166499 100644 --- a/net/batman-adv/Makefile +++ b/net/batman-adv/Makefile | |||
| @@ -19,8 +19,8 @@ | |||
| 19 | # | 19 | # |
| 20 | 20 | ||
| 21 | obj-$(CONFIG_BATMAN_ADV) += batman-adv.o | 21 | obj-$(CONFIG_BATMAN_ADV) += batman-adv.o |
| 22 | batman-adv-y += aggregation.o | ||
| 23 | batman-adv-y += bat_debugfs.o | 22 | batman-adv-y += bat_debugfs.o |
| 23 | batman-adv-y += bat_iv_ogm.o | ||
| 24 | batman-adv-y += bat_sysfs.o | 24 | batman-adv-y += bat_sysfs.o |
| 25 | batman-adv-y += bitarray.o | 25 | batman-adv-y += bitarray.o |
| 26 | batman-adv-y += gateway_client.o | 26 | batman-adv-y += gateway_client.o |