diff options
| author | James Bottomley <jejb@titanic.(none)> | 2005-05-20 16:27:44 -0400 |
|---|---|---|
| committer | James Bottomley <jejb@titanic.(none)> | 2005-05-20 16:27:44 -0400 |
| commit | ad34ea2cc3845ef4dcd7d12fb0fa8484734bd672 (patch) | |
| tree | ad434400f5ecaa33b433c8f830e40792d8d6c05c /net/wanrouter/wanmain.c | |
| parent | 90356ac3194bf91a441a5f9c3067af386ef62462 (diff) | |
| parent | 88d7bd8cb9eb8d64bf7997600b0d64f7834047c5 (diff) | |
merge by hand - fix up rejections in Documentation/DocBook/Makefile
Diffstat (limited to 'net/wanrouter/wanmain.c')
| -rw-r--r-- | net/wanrouter/wanmain.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/net/wanrouter/wanmain.c b/net/wanrouter/wanmain.c index 956c17f6c548..d6844ac226f5 100644 --- a/net/wanrouter/wanmain.c +++ b/net/wanrouter/wanmain.c | |||
| @@ -48,8 +48,8 @@ | |||
| 48 | #include <linux/kernel.h> | 48 | #include <linux/kernel.h> |
| 49 | #include <linux/init.h> | 49 | #include <linux/init.h> |
| 50 | #include <linux/module.h> /* support for loadable modules */ | 50 | #include <linux/module.h> /* support for loadable modules */ |
| 51 | #include <linux/slab.h> /* kmalloc(), kfree() */ | 51 | #include <linux/slab.h> /* kmalloc(), kfree() */ |
| 52 | #include <linux/mm.h> /* verify_area(), etc. */ | 52 | #include <linux/mm.h> |
| 53 | #include <linux/string.h> /* inline mem*, str* functions */ | 53 | #include <linux/string.h> /* inline mem*, str* functions */ |
| 54 | 54 | ||
| 55 | #include <asm/byteorder.h> /* htons(), etc. */ | 55 | #include <asm/byteorder.h> /* htons(), etc. */ |