From patchwork Thu May 26 08:53:17 2011
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
X-Patchwork-Submitter: Jesper Juhl <jj@chaosbits.net>
X-Patchwork-Id: 97508
X-Patchwork-Delegate: davem@davemloft.net
Return-Path: <netdev-owner@vger.kernel.org>
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 2F03FB6F9F
	for <patchwork-incoming@ozlabs.org>;
	Thu, 26 May 2011 19:01:21 +1000 (EST)
Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand
	id S1753955Ab1EZJA7 (ORCPT <rfc822;patchwork-incoming@ozlabs.org>);
	Thu, 26 May 2011 05:00:59 -0400
Received: from swampdragon.chaosbits.net ([90.184.90.115]:26177 "EHLO
	swampdragon.chaosbits.net" rhost-flags-OK-OK-OK-OK) by
	vger.kernel.org with ESMTP id S1752970Ab1EZJA5 (ORCPT
	<rfc822;netdev@vger.kernel.org>); Thu, 26 May 2011 05:00:57 -0400
Received: by swampdragon.chaosbits.net (Postfix, from userid 1000)
	id EF79A9403D; Thu, 26 May 2011 10:53:17 +0200 (CEST)
Received: from localhost (localhost [127.0.0.1])
	by swampdragon.chaosbits.net (Postfix) with ESMTP id EDA039403B;
	Thu, 26 May 2011 10:53:17 +0200 (CEST)
Date: Thu, 26 May 2011 10:53:17 +0200 (CEST)
From: Jesper Juhl <jj@chaosbits.net>
To: linux-kernel@vger.kernel.org
cc: Luciano Coelho <coelho@ti.com>,
	"John W. Linville" <linville@tuxdriver.com>,
	Johannes Berg <johannes@sipsolutions.net>,
	"David S. Miller" <davem@davemloft.net>, netdev@vger.kernel.org,
	linux-wireless@vger.kernel.org, trivial@kernel.org
Subject: [PATCH][Trivial] mac80211: Remove duplicate linux/slab.h include
	from net/mac80211/scan.c
Message-ID: <alpine.LNX.2.00.1105261048570.17400@swampdragon.chaosbits.net>
User-Agent: Alpine 2.00 (LNX 1167 2008-08-23)
MIME-Version: 1.0
Sender: netdev-owner@vger.kernel.org
Precedence: bulk
List-ID: <netdev.vger.kernel.org>
X-Mailing-List: netdev@vger.kernel.org

Commit 79f460ca49d8d5700756ab7071c951311c7f29cc add a duplicate 
linux/slab.h include to net/mac80211/scan.c - remove it.

Signed-off-by: Jesper Juhl <jj@chaosbits.net>
Acked-by: Luciano Coelho <coelho@ti.com>
---
 scan.c |    1 -
 1 file changed, 1 deletion(-)

 patch against current Linus' tree

diff --git a/net/mac80211/scan.c b/net/mac80211/scan.c
index 27af672..58ffa7d 100644
--- a/net/mac80211/scan.c
+++ b/net/mac80211/scan.c
@@ -15,7 +15,6 @@
 #include <linux/if_arp.h>
 #include <linux/rtnetlink.h>
 #include <linux/pm_qos_params.h>
-#include <linux/slab.h>
 #include <net/sch_generic.h>
 #include <linux/slab.h>
 #include <net/mac80211.h>