diff options
author | David S. Miller | 2010-04-11 11:44:30 +0200 |
---|---|---|
committer | David S. Miller | 2010-04-11 11:44:30 +0200 |
commit | 4a1032faac94ebbf647460ae3e06fc21146eb280 (patch) | |
tree | 7f31b97beb0406faa1523e619289ad0ab07c9787 /drivers/net/wireless/wl12xx/wl1271_cmd.c | |
parent | Revert "tcp: Set CHECKSUM_UNNECESSARY in tcp_init_nondata_skb" (diff) | |
parent | Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/rol... (diff) | |
download | kernel-qcow2-linux-4a1032faac94ebbf647460ae3e06fc21146eb280.tar.gz kernel-qcow2-linux-4a1032faac94ebbf647460ae3e06fc21146eb280.tar.xz kernel-qcow2-linux-4a1032faac94ebbf647460ae3e06fc21146eb280.zip |
Merge branch 'master' of /home/davem/src/GIT/linux-2.6/
Diffstat (limited to 'drivers/net/wireless/wl12xx/wl1271_cmd.c')
-rw-r--r-- | drivers/net/wireless/wl12xx/wl1271_cmd.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/net/wireless/wl12xx/wl1271_cmd.c b/drivers/net/wireless/wl12xx/wl1271_cmd.c index 36a64e06f290..e7832f3318eb 100644 --- a/drivers/net/wireless/wl12xx/wl1271_cmd.c +++ b/drivers/net/wireless/wl12xx/wl1271_cmd.c @@ -26,6 +26,7 @@ #include <linux/crc7.h> #include <linux/spi/spi.h> #include <linux/etherdevice.h> +#include <linux/slab.h> #include "wl1271.h" #include "wl1271_reg.h" |