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/yellowfin.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/yellowfin.c')
| -rw-r--r-- | drivers/net/yellowfin.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/drivers/net/yellowfin.c b/drivers/net/yellowfin.c index 7d4107f5eeb..ede5b2436f2 100644 --- a/drivers/net/yellowfin.c +++ b/drivers/net/yellowfin.c | |||
| @@ -90,7 +90,6 @@ static int gx_fix; | |||
| 90 | #include <linux/timer.h> | 90 | #include <linux/timer.h> |
| 91 | #include <linux/errno.h> | 91 | #include <linux/errno.h> |
| 92 | #include <linux/ioport.h> | 92 | #include <linux/ioport.h> |
| 93 | #include <linux/slab.h> | ||
| 94 | #include <linux/interrupt.h> | 93 | #include <linux/interrupt.h> |
| 95 | #include <linux/pci.h> | 94 | #include <linux/pci.h> |
| 96 | #include <linux/init.h> | 95 | #include <linux/init.h> |