From patchwork Sat Jun 26 00:36:26 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sven Eckelmann X-Patchwork-Id: 253 Return-Path: Received: from mail.gmx.net (mail.gmx.net [213.165.64.20]) by open-mesh.net (Postfix) with SMTP id 00B2015450B for ; Sat, 26 Jun 2010 02:36:31 +0200 (CEST) Received: (qmail invoked by alias); 26 Jun 2010 00:36:31 -0000 Received: from unknown (EHLO sven-desktop.lazhur.ath.cx) [89.246.216.8] by mail.gmx.net (mp063) with SMTP; 26 Jun 2010 02:36:31 +0200 X-Authenticated: #15668376 X-Provags-ID: V01U2FsdGVkX1+yaQQI+peyRV+ZgXm/Nv/pK1k1LGsS/5PitmO/QW KSnOQg7tMfRBXn From: Sven Eckelmann To: greg@kroah.com Date: Sat, 26 Jun 2010 02:36:26 +0200 Message-Id: <1277512586-9366-1-git-send-email-sven.eckelmann@gmx.de> X-Mailer: git-send-email 1.7.1 In-Reply-To: <201006260236.10217.sven.eckelmann@gmx.de> References: <201006260236.10217.sven.eckelmann@gmx.de> X-Y-GMX-Trusted: 0 Cc: b.a.t.m.a.n@lists.open-mesh.net Subject: [B.A.T.M.A.N.] [PATCH 1/2] Staging: batman-adv: Allow to build it inside the kernel X-BeenThere: b.a.t.m.a.n@lists.open-mesh.org X-Mailman-Version: 2.1.11 Precedence: list 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: , X-List-Received-Date: Sat, 26 Jun 2010 00:36:32 -0000 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