From patchwork Mon Feb 14 22:38:18 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jesper Juhl X-Patchwork-Id: 83162 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 61C0CB70A5 for ; Tue, 15 Feb 2011 09:40:03 +1100 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752020Ab1BNWjW (ORCPT ); Mon, 14 Feb 2011 17:39:22 -0500 Received: from swampdragon.chaosbits.net ([90.184.90.115]:11911 "EHLO swampdragon.chaosbits.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750948Ab1BNWjV (ORCPT ); Mon, 14 Feb 2011 17:39:21 -0500 Received: by swampdragon.chaosbits.net (Postfix, from userid 1000) id 1507C9403D; Mon, 14 Feb 2011 23:38:18 +0100 (CET) Received: from localhost (localhost [127.0.0.1]) by swampdragon.chaosbits.net (Postfix) with ESMTP id 12FAC9403B; Mon, 14 Feb 2011 23:38:18 +0100 (CET) Date: Mon, 14 Feb 2011 23:38:18 +0100 (CET) From: Jesper Juhl To: b.a.t.m.a.n@lists.open-mesh.org cc: trivial@kernel.org, netdev@vger.kernel.org, linux-kernel@vger.kernel.org, "David S. Miller" , Marek Lindner , Simon Wunderlich , Sven Eckelmann Subject: [PATCH][trivial] Batman: Remove two duplicate includes. Message-ID: User-Agent: Alpine 2.00 (LNX 1167 2008-08-23) MIME-Version: 1.0 Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org Remove duplicate inclusion of "send.h" and "routing.h" from net/batman-adv/soft-interface.c Patch is against linux-next as of today. Signed-off-by: Jesper Juhl --- soft-interface.c | 2 -- 1 file changed, 2 deletions(-) diff --git a/net/batman-adv/soft-interface.c b/net/batman-adv/soft-interface.c index bd088f8..7e37077 100644 --- a/net/batman-adv/soft-interface.c +++ b/net/batman-adv/soft-interface.c @@ -29,14 +29,12 @@ #include "hash.h" #include "gateway_common.h" #include "gateway_client.h" -#include "send.h" #include "bat_sysfs.h" #include #include #include #include #include "unicast.h" -#include "routing.h" static int bat_get_settings(struct net_device *dev, struct ethtool_cmd *cmd);