git.samba.org
/
sfrench
/
cifs-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wirel...
[sfrench/cifs-2.6.git]
/
drivers
/
net
/
wireless
/
libertas
/
if_sdio.c
diff --git
a/drivers/net/wireless/libertas/if_sdio.c
b/drivers/net/wireless/libertas/if_sdio.c
index 094176e92ebe6f5ecda038e9e6f22ef1824c787a..64dd345d30f526f2c10ff0b4c0b03998798e0fc0 100644
(file)
--- a/
drivers/net/wireless/libertas/if_sdio.c
+++ b/
drivers/net/wireless/libertas/if_sdio.c
@@
-28,6
+28,7
@@
#include <linux/kernel.h>
#include <linux/moduleparam.h>
+#include <linux/slab.h>
#include <linux/firmware.h>
#include <linux/netdevice.h>
#include <linux/delay.h>