diff options
| author | Ingo Molnar <mingo@elte.hu> | 2010-04-15 03:35:24 -0400 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2010-04-15 03:36:16 -0400 |
| commit | b257c14ceb1194a6181144210056d38f22127189 (patch) | |
| tree | c803925f1d5bf2237e7495d306bf43929df0c952 /drivers/net/3c505.c | |
| parent | 371fd7e7a56a5c136d31aa980011bd2f131c3ef5 (diff) | |
| parent | 2ba3abd8186f24c7fb418927025b4e2120e3a362 (diff) | |
Merge branch 'linus' into sched/core
Merge reason: merge the latest fixes, update to -rc4.
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'drivers/net/3c505.c')
| -rw-r--r-- | drivers/net/3c505.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/3c505.c b/drivers/net/3c505.c index 04b5bba19021..29b8d1d63bde 100644 --- a/drivers/net/3c505.c +++ b/drivers/net/3c505.c | |||
| @@ -102,12 +102,12 @@ | |||
| 102 | #include <linux/interrupt.h> | 102 | #include <linux/interrupt.h> |
| 103 | #include <linux/errno.h> | 103 | #include <linux/errno.h> |
| 104 | #include <linux/in.h> | 104 | #include <linux/in.h> |
| 105 | #include <linux/slab.h> | ||
| 106 | #include <linux/ioport.h> | 105 | #include <linux/ioport.h> |
| 107 | #include <linux/spinlock.h> | 106 | #include <linux/spinlock.h> |
| 108 | #include <linux/ethtool.h> | 107 | #include <linux/ethtool.h> |
| 109 | #include <linux/delay.h> | 108 | #include <linux/delay.h> |
| 110 | #include <linux/bitops.h> | 109 | #include <linux/bitops.h> |
| 110 | #include <linux/gfp.h> | ||
| 111 | 111 | ||
| 112 | #include <asm/uaccess.h> | 112 | #include <asm/uaccess.h> |
| 113 | #include <asm/io.h> | 113 | #include <asm/io.h> |