diff options
| author | David S. Miller | 2010-03-23 02:15:15 +0100 |
|---|---|---|
| committer | David S. Miller | 2010-03-23 02:15:15 +0100 |
| commit | 33e2bf6aa16061bae1253514e7c32af27d2b4b31 (patch) | |
| tree | 652d13b4feea9a8f562186e7badae72d2e22fe1f /drivers/net/wireless/wl12xx/wl1271_ps.c | |
| parent | rps: Fix build with CONFIG_SYSFS enabled (diff) | |
| parent | rename new rfkill sysfs knobs (diff) | |
| download | kernel-qcow2-linux-33e2bf6aa16061bae1253514e7c32af27d2b4b31.tar.gz kernel-qcow2-linux-33e2bf6aa16061bae1253514e7c32af27d2b4b31.tar.xz kernel-qcow2-linux-33e2bf6aa16061bae1253514e7c32af27d2b4b31.zip | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next-2.6
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 |