diff options
| author | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2009-11-06 10:46:18 -0500 |
|---|---|---|
| committer | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2009-11-06 10:46:18 -0500 |
| commit | 330f28f691e9b349e34adcaf82b273cf061bb491 (patch) | |
| tree | fca3bfe41eff25ef19f576cef1979c68f6521af5 /drivers/net/skge.c | |
| parent | fe3e78e073d25308756f38019956061153267769 (diff) | |
| parent | 6fc786d5034ed7ce2d43c459211137de6d99dd28 (diff) | |
Merge branch 'for-2.6.32' into for-2.6.33
Diffstat (limited to 'drivers/net/skge.c')
| -rw-r--r-- | drivers/net/skge.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/net/skge.c b/drivers/net/skge.c index 01f6811f1324..8f5414348e86 100644 --- a/drivers/net/skge.c +++ b/drivers/net/skge.c | |||
| @@ -37,6 +37,7 @@ | |||
| 37 | #include <linux/crc32.h> | 37 | #include <linux/crc32.h> |
| 38 | #include <linux/dma-mapping.h> | 38 | #include <linux/dma-mapping.h> |
| 39 | #include <linux/debugfs.h> | 39 | #include <linux/debugfs.h> |
| 40 | #include <linux/sched.h> | ||
| 40 | #include <linux/seq_file.h> | 41 | #include <linux/seq_file.h> |
| 41 | #include <linux/mii.h> | 42 | #include <linux/mii.h> |
| 42 | #include <asm/irq.h> | 43 | #include <asm/irq.h> |