git://ftp.safe.ca
/
safe
/
jmp
/
linux-2.6
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
staging: vt6655: Fix kernel BUG on driver wpa initialization
[safe/jmp/linux-2.6]
/
drivers
/
net
/
jazzsonic.c
diff --git
a/drivers/net/jazzsonic.c
b/drivers/net/jazzsonic.c
index
f47d4d6
..
3e6aaf9
100644
(file)
--- a/
drivers/net/jazzsonic.c
+++ b/
drivers/net/jazzsonic.c
@@
-22,11
+22,11
@@
#include <linux/module.h>
#include <linux/types.h>
#include <linux/fcntl.h>
#include <linux/module.h>
#include <linux/types.h>
#include <linux/fcntl.h>
+#include <linux/gfp.h>
#include <linux/interrupt.h>
#include <linux/init.h>
#include <linux/ioport.h>
#include <linux/in.h>
#include <linux/interrupt.h>
#include <linux/init.h>
#include <linux/ioport.h>
#include <linux/in.h>
-#include <linux/slab.h>
#include <linux/string.h>
#include <linux/delay.h>
#include <linux/errno.h>
#include <linux/string.h>
#include <linux/delay.h>
#include <linux/errno.h>
@@
-35,6
+35,7
@@
#include <linux/skbuff.h>
#include <linux/platform_device.h>
#include <linux/dma-mapping.h>
#include <linux/skbuff.h>
#include <linux/platform_device.h>
#include <linux/dma-mapping.h>
+#include <linux/slab.h>
#include <asm/bootinfo.h>
#include <asm/system.h>
#include <asm/bootinfo.h>
#include <asm/system.h>