diff options
| author | Jiri Kosina <jkosina@suse.cz> | 2010-05-03 09:25:35 -0400 |
|---|---|---|
| committer | Jiri Kosina <jkosina@suse.cz> | 2010-05-03 09:25:35 -0400 |
| commit | d6d53cbc6b10d28646fb6184d1069f336ec76dc4 (patch) | |
| tree | 1c844b3ce8bd430becbbb74875898b08d9f89bb5 /drivers/net/cs89x0.c | |
| parent | 0b5adf92ec793c665b0de63ac146d190a921c391 (diff) | |
| parent | 6a740aa4f47b9f29bad5292cf51f008f3edad9b1 (diff) | |
Merge branch 'hid-suspend' into picolcd
Diffstat (limited to 'drivers/net/cs89x0.c')
| -rw-r--r-- | drivers/net/cs89x0.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/cs89x0.c b/drivers/net/cs89x0.c index b0208e474f7e..4c38491b8efb 100644 --- a/drivers/net/cs89x0.c +++ b/drivers/net/cs89x0.c | |||
| @@ -138,12 +138,12 @@ | |||
| 138 | #include <linux/ioport.h> | 138 | #include <linux/ioport.h> |
| 139 | #include <linux/in.h> | 139 | #include <linux/in.h> |
| 140 | #include <linux/skbuff.h> | 140 | #include <linux/skbuff.h> |
| 141 | #include <linux/slab.h> | ||
| 142 | #include <linux/spinlock.h> | 141 | #include <linux/spinlock.h> |
| 143 | #include <linux/string.h> | 142 | #include <linux/string.h> |
| 144 | #include <linux/init.h> | 143 | #include <linux/init.h> |
| 145 | #include <linux/bitops.h> | 144 | #include <linux/bitops.h> |
| 146 | #include <linux/delay.h> | 145 | #include <linux/delay.h> |
| 146 | #include <linux/gfp.h> | ||
| 147 | 147 | ||
| 148 | #include <asm/system.h> | 148 | #include <asm/system.h> |
| 149 | #include <asm/io.h> | 149 | #include <asm/io.h> |