The following commit has been merged in the linux branch: commit 91ca358ef3b5e5f0ba3b4bddb0acb0fa6d7b9b80 Author: Andrew Lunn lunn@lunn.ch Date: Sun Nov 8 19:17:04 2009 +0100

Remove Makefile.kbuild which is not used for in kernel builds.

diff --git a/drivers/staging/batman-adv/Makefile.kbuild b/drivers/staging/batman-adv/Makefile.kbuild deleted file mode 100644 index 6be1223..0000000 --- a/drivers/staging/batman-adv/Makefile.kbuild +++ /dev/null @@ -1,33 +0,0 @@ -# -# Copyright (C) 2007-2009 B.A.T.M.A.N. contributors: -# -# Marek Lindner, Simon Wunderlich -# -# This program is free software; you can redistribute it and/or -# modify it under the terms of version 2 of the GNU General Public -# License as published by the Free Software Foundation. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -# General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA -# 02110-1301, USA -# - - - -# openwrt integration -ifeq ($(MAKING_MODULES),1) --include $(TOPDIR)/Rules.make -endif - -ifneq ($(REVISION),) -EXTRA_CFLAGS += -DREVISION_VERSION="r$(REVISION)" -endif - -obj-m += batman-adv.o -batman-adv-objs := main.o proc.o send.o log.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