The following commit has been merged in the master branch: commit 9fc1883ef25a43b895531ac44a38257ba8c2ca62 Author: Markus Pargmann mpa@pengutronix.de Date: Fri Dec 26 12:41:25 2014 +0100

batman-adv: Makefile, Sort alphabetically

The whole Makefile is sorted, just the multicast rule is not at the right position.

Signed-off-by: Markus Pargmann mpa@pengutronix.de Signed-off-by: Marek Lindner mareklindner@neomailbox.ch

diff --git a/net/batman-adv/Makefile b/net/batman-adv/Makefile index bd7e343..21434ab 100644 --- a/net/batman-adv/Makefile +++ b/net/batman-adv/Makefile @@ -29,6 +29,7 @@ batman-adv-y += hard-interface.o batman-adv-y += hash.o batman-adv-y += icmp_socket.o batman-adv-y += main.o +batman-adv-$(CONFIG_BATMAN_ADV_MCAST) += multicast.o batman-adv-$(CONFIG_BATMAN_ADV_NC) += network-coding.o batman-adv-y += originator.o batman-adv-y += routing.o @@ -36,4 +37,3 @@ batman-adv-y += send.o batman-adv-y += soft-interface.o batman-adv-y += sysfs.o batman-adv-y += translation-table.o -batman-adv-$(CONFIG_BATMAN_ADV_MCAST) += multicast.o