diff options
| author | David S. Miller <davem@davemloft.net> | 2010-04-13 03:28:45 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2010-04-13 03:28:45 -0400 |
| commit | 9343af084c7e8911897b0883042ee690cee3aaef (patch) | |
| tree | 6211a4bdc84690bec6530d27a3abb19f5e8bb8f3 /drivers/net/wireless/iwmc3200wifi/hal.c | |
| parent | e182c77cc291456eed127b1472952ddb59a81a9d (diff) | |
| parent | 0d0fb0f9c5fddef4a10242fe3337f00f528a3099 (diff) | |
Merge branch 'master' of /home/davem/src/GIT/linux-2.6/
Conflicts:
lib/Kconfig.debug
Diffstat (limited to 'drivers/net/wireless/iwmc3200wifi/hal.c')
| -rw-r--r-- | drivers/net/wireless/iwmc3200wifi/hal.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/net/wireless/iwmc3200wifi/hal.c b/drivers/net/wireless/iwmc3200wifi/hal.c index d13c8853ee82..229de990379c 100644 --- a/drivers/net/wireless/iwmc3200wifi/hal.c +++ b/drivers/net/wireless/iwmc3200wifi/hal.c | |||
| @@ -98,6 +98,7 @@ | |||
| 98 | */ | 98 | */ |
| 99 | #include <linux/kernel.h> | 99 | #include <linux/kernel.h> |
| 100 | #include <linux/netdevice.h> | 100 | #include <linux/netdevice.h> |
| 101 | #include <linux/slab.h> | ||
| 101 | 102 | ||
| 102 | #include "iwm.h" | 103 | #include "iwm.h" |
| 103 | #include "bus.h" | 104 | #include "bus.h" |