The following commit has been merged in the master branch: commit c5cb3c51eb0e58e2e8542918729fe57432933c16 Author: Sven Eckelmann sven@narfation.org Date: Fri Sep 30 13:32:00 2011 +0200

batman-adv: Don't use EXTRA_CFLAGS to add source version

EXTRA_CFLAGS is deprecated since v2.6.23-2309-gf77bf01 and should not be used anymore to add additional flags for the c compiler.

Signed-off-by: Sven Eckelmann sven@narfation.org

diff --git a/Makefile.kbuild b/Makefile.kbuild index 6377c17..bd7e93c 100644 --- a/Makefile.kbuild +++ b/Makefile.kbuild @@ -25,10 +25,10 @@ ifeq ($(MAKING_MODULES),1) -include $(TOPDIR)/Rules.make endif

-# EXTRA_CFLAGS += -DCONFIG_BATMAN_ADV_DEBUG +# ccflags-y += -DCONFIG_BATMAN_ADV_DEBUG

ifneq ($(REVISION),) -EXTRA_CFLAGS += -DSOURCE_VERSION="$(REVISION)" +ccflags-y += -DSOURCE_VERSION="$(REVISION)" endif

obj-m += batman-adv.o diff --git a/README b/README index 1e000ee..5ba56b5 100644 --- a/README +++ b/README @@ -1,4 +1,4 @@ -[state: 21-08-2011] +[state: 30-09-2011]

BATMAN-ADV ---------- @@ -206,7 +206,7 @@ option "B.A.T.M.A.N. debugging". When compiling outside of the kernel tree it is necessary to edit the file Makefile.kbuild and uncomment the line

-#EXTRA_CFLAGS += -DCONFIG_BATMAN_ADV_DEBUG +#ccflags-y += -DCONFIG_BATMAN_ADV_DEBUG

Those additional debug messages can be accessed using a special file in debugfs