]> git.proxmox.com Git - mirror_ubuntu-disco-kernel.git/commitdiff
mac80211: Remove duplicate linux/slab.h include from net/mac80211/scan.c
authorJesper Juhl <jj@chaosbits.net>
Thu, 26 May 2011 08:53:17 +0000 (10:53 +0200)
committerJohn W. Linville <linville@tuxdriver.com>
Fri, 27 May 2011 16:53:47 +0000 (12:53 -0400)
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>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
net/mac80211/scan.c

index 27af6723cb5e5496efc606010bf04541806da43e..58ffa7d069c791c7d2c2c681861212d806260956 100644 (file)
@@ -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>