From: Vipin Mehta <vmehta@atheros.com>
Date: Sat, 18 Sep 2010 01:26:03 +0000 (-0700)
Subject: staging: ath6kl: Removing duplicate includes
X-Git-Url: http://drtracing.org/?a=commitdiff_plain;h=86fc4c897e3e9ebcf6449be4fc2436abfe0473a2;p=deliverable%2Flinux.git

staging: ath6kl: Removing duplicate includes

Eliminating the inclusion of the same header file more than once.
The files being removed are already included by osapi_linux.h.

Reported-by: Randy Dunlap <randy.dunlap@oracle.com>
Signed-off-by: Vipin Mehta <vmehta@atheros.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
---

diff --git a/drivers/staging/ath6kl/miscdrv/ar3kps/ar3kpsconfig.h b/drivers/staging/ath6kl/miscdrv/ar3kps/ar3kpsconfig.h
index 4358834f6d71..4e5b7bfc0ea9 100644
--- a/drivers/staging/ath6kl/miscdrv/ar3kps/ar3kpsconfig.h
+++ b/drivers/staging/ath6kl/miscdrv/ar3kps/ar3kpsconfig.h
@@ -36,15 +36,11 @@
 
 #include <linux/fs.h>
 #include <linux/errno.h>
-#include <linux/string.h>
 #include <linux/signal.h>
-#include <linux/timer.h>
 
 
 #include <linux/ioctl.h>
-#include <linux/skbuff.h>
 #include <linux/firmware.h>
-#include <linux/wait.h>
 
 
 #include <net/bluetooth/bluetooth.h>
diff --git a/drivers/staging/ath6kl/os/linux/cfg80211.c b/drivers/staging/ath6kl/os/linux/cfg80211.c
index a8b9241f7d87..c94ad29eeb4d 100644
--- a/drivers/staging/ath6kl/os/linux/cfg80211.c
+++ b/drivers/staging/ath6kl/os/linux/cfg80211.c
@@ -21,8 +21,6 @@
 // Author(s): ="Atheros"
 //------------------------------------------------------------------------------
 
-#include <linux/kernel.h>
-#include <linux/netdevice.h>
 #include <linux/wireless.h>
 #include <linux/ieee80211.h>
 #include <net/cfg80211.h>
diff --git a/drivers/staging/ath6kl/os/linux/include/ar6000_drv.h b/drivers/staging/ath6kl/os/linux/include/ar6000_drv.h
index 8be4f553ab8e..e6248830b7ef 100644
--- a/drivers/staging/ath6kl/os/linux/include/ar6000_drv.h
+++ b/drivers/staging/ath6kl/os/linux/include/ar6000_drv.h
@@ -24,22 +24,14 @@
 #ifndef _AR6000_H_
 #define _AR6000_H_
 
-#include <linux/version.h>
-
-
-#include <generated/autoconf.h>
 #include <linux/init.h>
-#include <linux/kernel.h>
 #include <linux/sched.h>
 #include <linux/spinlock.h>
-#include <linux/skbuff.h>
 #include <linux/if_ether.h>
-#include <linux/netdevice.h>
 #include <linux/etherdevice.h>
 #include <net/iw_handler.h>
 #include <linux/if_arp.h>
 #include <linux/ip.h>
-#include <linux/semaphore.h>
 #include <linux/wireless.h>
 #ifdef ATH6K_CONFIG_CFG80211
 #include <net/cfg80211.h>
diff --git a/drivers/staging/ath6kl/os/linux/netbuf.c b/drivers/staging/ath6kl/os/linux/netbuf.c
index 63fa49c8567a..15e5d0475202 100644
--- a/drivers/staging/ath6kl/os/linux/netbuf.c
+++ b/drivers/staging/ath6kl/os/linux/netbuf.c
@@ -20,8 +20,6 @@
 //
 // Author(s): ="Atheros"
 //------------------------------------------------------------------------------
-#include <linux/kernel.h>
-#include <linux/skbuff.h>
 #include <a_config.h>
 #include "athdefs.h"
 #include "a_types.h"