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/slip.c | |
| parent | fe3e78e073d25308756f38019956061153267769 (diff) | |
| parent | 6fc786d5034ed7ce2d43c459211137de6d99dd28 (diff) | |
Merge branch 'for-2.6.32' into for-2.6.33
Diffstat (limited to 'drivers/net/slip.c')
| -rw-r--r-- | drivers/net/slip.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/net/slip.c b/drivers/net/slip.c index e17c535a577e..fe3cebb984de 100644 --- a/drivers/net/slip.c +++ b/drivers/net/slip.c | |||
| @@ -67,6 +67,7 @@ | |||
| 67 | #include <asm/system.h> | 67 | #include <asm/system.h> |
| 68 | #include <asm/uaccess.h> | 68 | #include <asm/uaccess.h> |
| 69 | #include <linux/bitops.h> | 69 | #include <linux/bitops.h> |
| 70 | #include <linux/sched.h> | ||
| 70 | #include <linux/string.h> | 71 | #include <linux/string.h> |
| 71 | #include <linux/mm.h> | 72 | #include <linux/mm.h> |
| 72 | #include <linux/interrupt.h> | 73 | #include <linux/interrupt.h> |