Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 324477
b: refs/heads/master
c: 3d4e9e5
h: refs/heads/master
i:
  324475: dc05345
v: v3
  • Loading branch information
Jesper Juhl authored and Greg Kroah-Hartman committed Aug 14, 2012
1 parent bf2741c commit c1d924b
Show file tree
Hide file tree
Showing 12 changed files with 11 additions and 13 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: a6c42258ac8735aa25a4e5b711df2e516c3aff14
refs/heads/master: 3d4e9e57e6da4ccd4c9710c76651175bc756799e
1 change: 0 additions & 1 deletion trunk/drivers/staging/csr/csr_panic.c
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,6 @@
*****************************************************************************/

#include <linux/kernel.h>
#include <linux/version.h>
#include <linux/module.h>

#include "csr_panic.h"
Expand Down
3 changes: 1 addition & 2 deletions trunk/drivers/staging/csr/drv.c
Original file line number Diff line number Diff line change
Expand Up @@ -15,8 +15,6 @@
* ---------------------------------------------------------------------------
*/



/*
* Porting Notes:
* Part of this file contains an example for how to glue the OS layer
Expand All @@ -37,6 +35,7 @@
#include <linux/poll.h>
#include <asm/uaccess.h>
#include <linux/jiffies.h>
#include <linux/version.h>

#include "csr_wifi_hip_unifiversion.h"
#include "unifi_priv.h"
Expand Down
2 changes: 1 addition & 1 deletion trunk/drivers/staging/csr/io.c
Original file line number Diff line number Diff line change
Expand Up @@ -31,14 +31,14 @@
* ---------------------------------------------------------------------------
*/
#include <linux/proc_fs.h>
#include <linux/version.h>

#include "csr_wifi_hip_unifi.h"
#include "csr_wifi_hip_unifiversion.h"
#include "csr_wifi_hip_unifi_udi.h" /* for unifi_print_status() */
#include "unifiio.h"
#include "unifi_priv.h"


/*
* Array of pointers to context structs for unifi devices that are present.
* The index in the array corresponds to the wlan interface number
Expand Down
3 changes: 1 addition & 2 deletions trunk/drivers/staging/csr/monitor.c
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@
* ---------------------------------------------------------------------------
*/

#include <linux/version.h>
#include "unifi_priv.h"

#ifdef UNIFI_SNIFF_ARPHRD
Expand All @@ -23,8 +24,6 @@
#define ETH_P_80211_RAW ETH_P_ALL
#endif



/*
* ---------------------------------------------------------------------------
* uf_start_sniff
Expand Down
3 changes: 1 addition & 2 deletions trunk/drivers/staging/csr/netdev.c
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,6 @@
* ---------------------------------------------------------------------------
*/


/*
* Porting Notes:
* This file implements the data plane of the UniFi linux driver.
Expand Down Expand Up @@ -48,7 +47,7 @@
#include <linux/etherdevice.h>
#include <linux/mutex.h>
#include <linux/semaphore.h>

#include <linux/version.h>
#include <linux/vmalloc.h>
#include "csr_wifi_hip_unifi.h"
#include "csr_wifi_hip_conversions.h"
Expand Down
2 changes: 1 addition & 1 deletion trunk/drivers/staging/csr/sdio_mmc.c
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
#include <linux/kernel.h>
#include <linux/mutex.h>
#include <linux/gfp.h>

#include <linux/version.h>
#include <linux/mmc/core.h>
#include <linux/mmc/card.h>
#include <linux/mmc/host.h>
Expand Down
2 changes: 1 addition & 1 deletion trunk/drivers/staging/csr/sme_native.c
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
*/

#include <linux/netdevice.h>

#include <linux/version.h>
#include "unifi_priv.h"
#include "csr_wifi_hip_unifi.h"
#include "csr_wifi_hip_conversions.h"
Expand Down
2 changes: 1 addition & 1 deletion trunk/drivers/staging/csr/sme_sys.c
Original file line number Diff line number Diff line change
Expand Up @@ -14,14 +14,14 @@
* ---------------------------------------------------------------------------
*/

#include <linux/version.h>
#include "csr_wifi_hip_unifiversion.h"
#include "unifi_priv.h"
#include "csr_wifi_hip_conversions.h"
#ifdef CSR_SUPPORT_WEXT_AP
#include "csr_wifi_sme_sef.h"
#endif


/*
* This file implements the SME SYS API and contains the following functions:
* CsrWifiRouterCtrlMediaStatusReqHandler()
Expand Down
1 change: 1 addition & 0 deletions trunk/drivers/staging/csr/ul_int.c
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@
*
* ***************************************************************************
*/
#include <linux/version.h>
#include "csr_wifi_hip_unifi.h"
#include "csr_wifi_hip_conversions.h"
#include "unifi_priv.h"
Expand Down
2 changes: 1 addition & 1 deletion trunk/drivers/staging/csr/unifi_pdu_processing.c
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
* ---------------------------------------------------------------------------
*/


#include <linux/version.h>
#include <linux/types.h>
#include <linux/etherdevice.h>
#include <linux/vmalloc.h>
Expand Down
1 change: 1 addition & 0 deletions trunk/drivers/staging/csr/unifi_wext.h
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@
#define __LINUX_UNIFI_WEXT_H__ 1

#include <linux/kernel.h>
#include <linux/version.h>
#include <net/iw_handler.h>
#include "csr_wifi_sme_prim.h"

Expand Down

0 comments on commit c1d924b

Please sign in to comment.