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/slip.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/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 ba5bbc503446..89696156c059 100644 --- a/drivers/net/slip.c +++ b/drivers/net/slip.c | |||
| @@ -83,6 +83,7 @@ | |||
| 83 | #include <linux/compat.h> | 83 | #include <linux/compat.h> |
| 84 | #include <linux/delay.h> | 84 | #include <linux/delay.h> |
| 85 | #include <linux/init.h> | 85 | #include <linux/init.h> |
| 86 | #include <linux/slab.h> | ||
| 86 | #include "slip.h" | 87 | #include "slip.h" |
| 87 | #ifdef CONFIG_INET | 88 | #ifdef CONFIG_INET |
| 88 | #include <linux/ip.h> | 89 | #include <linux/ip.h> |