diff options
| author | Russell King <rmk+kernel@arm.linux.org.uk> | 2009-10-12 09:38:08 -0400 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2009-10-12 09:38:08 -0400 |
| commit | edc72786d208e77db94f84dcb0d166c0d23d82f7 (patch) | |
| tree | 6fd32770f9cb2f1a888775514294d60aecba5245 /drivers/net/wan/cycx_x25.c | |
| parent | 6a5e293f1b34920c69a932ce37b4a4714a428dc7 (diff) | |
| parent | 4367216a099b4df3fa2c4f2b086cda1a1e9afc4e (diff) | |
Merge branch 'fix' of git://git.kernel.org/pub/scm/linux/kernel/git/ycmiao/pxa-linux-2.6
Diffstat (limited to 'drivers/net/wan/cycx_x25.c')
| -rw-r--r-- | drivers/net/wan/cycx_x25.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/net/wan/cycx_x25.c b/drivers/net/wan/cycx_x25.c index 2573c18b6aa5..cd8cb95c5bd7 100644 --- a/drivers/net/wan/cycx_x25.c +++ b/drivers/net/wan/cycx_x25.c | |||
| @@ -84,6 +84,7 @@ | |||
| 84 | #include <linux/kernel.h> /* printk(), and other useful stuff */ | 84 | #include <linux/kernel.h> /* printk(), and other useful stuff */ |
| 85 | #include <linux/module.h> | 85 | #include <linux/module.h> |
| 86 | #include <linux/string.h> /* inline memset(), etc. */ | 86 | #include <linux/string.h> /* inline memset(), etc. */ |
| 87 | #include <linux/sched.h> | ||
| 87 | #include <linux/slab.h> /* kmalloc(), kfree() */ | 88 | #include <linux/slab.h> /* kmalloc(), kfree() */ |
| 88 | #include <linux/stddef.h> /* offsetof(), etc. */ | 89 | #include <linux/stddef.h> /* offsetof(), etc. */ |
| 89 | #include <linux/wanrouter.h> /* WAN router definitions */ | 90 | #include <linux/wanrouter.h> /* WAN router definitions */ |