diff options
| author | Jens Axboe <jens.axboe@oracle.com> | 2009-11-03 15:14:39 -0500 |
|---|---|---|
| committer | Jens Axboe <jens.axboe@oracle.com> | 2009-11-03 15:14:39 -0500 |
| commit | 2058297d2d045cb57138c33b87cfabcc80e65186 (patch) | |
| tree | 7ccffd0e162cbd7471f643561e79f23abb989a62 /drivers/net/wireless/iwmc3200wifi/commands.c | |
| parent | 150e6c67f4bf6ab51e62defc41bd19a2eefe5709 (diff) | |
| parent | 4b27e1bb442e964903f8a3fa6bdf33a602dc0941 (diff) | |
Merge branch 'for-linus' into for-2.6.33
Conflicts:
block/cfq-iosched.c
Signed-off-by: Jens Axboe <jens.axboe@oracle.com>
Diffstat (limited to 'drivers/net/wireless/iwmc3200wifi/commands.c')
| -rw-r--r-- | drivers/net/wireless/iwmc3200wifi/commands.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/net/wireless/iwmc3200wifi/commands.c b/drivers/net/wireless/iwmc3200wifi/commands.c index 23b52fa2605f..84158b6d35d8 100644 --- a/drivers/net/wireless/iwmc3200wifi/commands.c +++ b/drivers/net/wireless/iwmc3200wifi/commands.c | |||
| @@ -40,6 +40,7 @@ | |||
| 40 | #include <linux/wireless.h> | 40 | #include <linux/wireless.h> |
| 41 | #include <linux/etherdevice.h> | 41 | #include <linux/etherdevice.h> |
| 42 | #include <linux/ieee80211.h> | 42 | #include <linux/ieee80211.h> |
| 43 | #include <linux/sched.h> | ||
| 43 | 44 | ||
| 44 | #include "iwm.h" | 45 | #include "iwm.h" |
| 45 | #include "bus.h" | 46 | #include "bus.h" |