The following commit has been merged in the next branch: commit 49e2d034fc551285abd21f36cb574ad01422da0d Author: Tracey Dent tdent48227@gmail.com Date: Tue Oct 12 10:08:29 2010 +0000

batman-adv: replace the use of <module>-objs with <module>-y

Changed <module>-objs to <module>-y n Makefile.

Signed-off-by: Tracey Dent tdent48227@gmail.com Signed-off-by: Greg Kroah-Hartman gregkh@suse.de Signed-off-by: Sven Eckelmann sven.eckelmann@gmx.de

diff --git a/Makefile.kbuild b/Makefile.kbuild index 561b64f..2a91716 100644 --- a/Makefile.kbuild +++ b/Makefile.kbuild @@ -32,4 +32,4 @@ EXTRA_CFLAGS += -DREVISION_VERSION="$(REVISION)" endif

obj-m += batman-adv.o -batman-adv-objs := main.o bat_debugfs.o bat_sysfs.o send.o routing.o soft-interface.o icmp_socket.o translation-table.o bitarray.o hash.o ring_buffer.o vis.o hard-interface.o aggregation.o originator.o unicast.o $(shell [ "2" -eq "$(VERSION)" ] 2>&- && [ "6" -eq "$(PATCHLEVEL)" ] 2>&- && [ "$(SUBLEVEL)" -le "28" ] 2>&- && echo bat_printk.o) +batman-adv-y := main.o bat_debugfs.o bat_sysfs.o send.o routing.o soft-interface.o icmp_socket.o translation-table.o bitarray.o hash.o ring_buffer.o vis.o hard-interface.o aggregation.o originator.o unicast.o $(shell [ "2" -eq "$(VERSION)" ] 2>&- && [ "6" -eq "$(PATCHLEVEL)" ] 2>&- && [ "$(SUBLEVEL)" -le "28" ] 2>&- && echo bat_printk.o)