From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: From: Sven Eckelmann Date: Sat, 26 Jun 2010 02:36:26 +0200 Message-Id: <1277512586-9366-1-git-send-email-sven.eckelmann@gmx.de> In-Reply-To: <201006260236.10217.sven.eckelmann@gmx.de> References: <201006260236.10217.sven.eckelmann@gmx.de> Subject: [B.A.T.M.A.N.] [PATCH 1/2] Staging: batman-adv: Allow to build it inside the kernel Reply-To: The list for a Better Approach To Mobile Ad-hoc Networking List-Id: The list for a Better Approach To Mobile Ad-hoc Networking List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: greg@kroah.com Cc: b.a.t.m.a.n@lists.open-mesh.net We must use the user supplied information about how the code should be compiled instead of always trying to build it as module. Signed-off-by: Sven Eckelmann --- drivers/staging/batman-adv/Makefile | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/drivers/staging/batman-adv/Makefile b/drivers/staging/batman-adv/Makefile index 654c4d2..e9817b5 100644 --- a/drivers/staging/batman-adv/Makefile +++ b/drivers/staging/batman-adv/Makefile @@ -18,5 +18,5 @@ # 02110-1301, USA # -obj-m += batman-adv.o +obj-$(CONFIG_BATMAN_ADV) += 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 -- 1.7.1