diff options
| author | Stephen Rothwell <sfr@canb.auug.org.au> | 2010-03-22 12:59:51 +1100 |
|---|---|---|
| committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2010-03-22 12:59:51 +1100 |
| commit | f016e79511c37d546f658463927f615c976fb571 (patch) | |
| tree | bfcdd617f1cdd8590e25827e33d0555682f247b5 /drivers/net/wireless/wl12xx/wl1271_ps.c | |
| parent | f850978ba7b1a715fc94d692cc396907763579b1 (diff) | |
| parent | 819bfecc4fc6b6e5a793f719a45b7146ce423b79 (diff) | |
Merge remote branch 'wireless/master'
Conflicts:
Documentation/feature-removal-schedule.txt
drivers/net/wireless/ath/ath5k/phy.c
Diffstat (limited to 'drivers/net/wireless/wl12xx/wl1271_ps.c')
| -rw-r--r-- | drivers/net/wireless/wl12xx/wl1271_ps.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/drivers/net/wireless/wl12xx/wl1271_ps.c b/drivers/net/wireless/wl12xx/wl1271_ps.c index e2b1ebf096e8..5a04482b9353 100644 --- a/drivers/net/wireless/wl12xx/wl1271_ps.c +++ b/drivers/net/wireless/wl12xx/wl1271_ps.c @@ -23,7 +23,6 @@ #include "wl1271_reg.h" #include "wl1271_ps.h" -#include "wl1271_spi.h" #include "wl1271_io.h" #define WL1271_WAKEUP_TIMEOUT 500 |