summaryrefslogtreecommitdiff
path: root/drivers/staging/batman-adv/Makefile
diff options
context:
space:
mode:
authorStephen Rothwell <sfr@canb.auug.org.au>2010-01-08 15:37:18 +1100
committerStephen Rothwell <sfr@canb.auug.org.au>2010-01-08 15:37:18 +1100
commit382bd41bfbc18549c3d8896971c81baaba7eef35 (patch)
tree7540b2e732f767fa2b2cc7eaaff04edc272f8957 /drivers/staging/batman-adv/Makefile
parent075ac84a8fc1568a0d22af872e458b4cc7d72de8 (diff)
parent7037d739b35c563f22a4c6281fa5d4e5e56d68f7 (diff)
Merge branch 'quilt/staging'
Diffstat (limited to 'drivers/staging/batman-adv/Makefile')
-rw-r--r--drivers/staging/batman-adv/Makefile2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/staging/batman-adv/Makefile b/drivers/staging/batman-adv/Makefile
index 02da87134fce..42b4e6370263 100644
--- a/drivers/staging/batman-adv/Makefile
+++ b/drivers/staging/batman-adv/Makefile
@@ -19,4 +19,4 @@
#
obj-m += batman-adv.o
-batman-adv-objs := main.o proc.o send.o routing.o soft-interface.o device.o translation-table.o bitarray.o hash.o ring_buffer.o vis.o hard-interface.o aggregation.o log.o
+batman-adv-objs := main.o proc.o send.o routing.o soft-interface.o device.o translation-table.o bitarray.o hash.o ring_buffer.o vis.o hard-interface.o aggregation.o originator.o