diff options
| author | Ralf Baechle <ralf@linux-mips.org> | 1999-06-17 13:25:08 +0000 |
|---|---|---|
| committer | Ralf Baechle <ralf@linux-mips.org> | 1999-06-17 13:25:08 +0000 |
| commit | 59223edaa18759982db0a8aced0e77457d10c68e (patch) | |
| tree | 89354903b01fa0a447bffeefe00df3044495db2e /net/wanrouter | |
| parent | db7d4daea91e105e3859cf461d7e53b9b77454b2 (diff) | |
Merge with Linux 2.3.6. Sorry, this isn't tested on silicon, I don't
have a MIPS box at hand.
Diffstat (limited to 'net/wanrouter')
| -rw-r--r-- | net/wanrouter/wanmain.c | 15 |
1 files changed, 9 insertions, 6 deletions
diff --git a/net/wanrouter/wanmain.c b/net/wanrouter/wanmain.c index 18942bd20..0c91e4c44 100644 --- a/net/wanrouter/wanmain.c +++ b/net/wanrouter/wanmain.c @@ -30,6 +30,7 @@ * Dec 22, 1998 Arnaldo Melo vmalloc/vfree used in device_setup to allocate * kernel memory and copy configuration data to * kernel space (for big firmwares) +* May 19, 1999 Arnaldo Melo __initfunc in wanrouter_init *****************************************************************************/ #include <linux/config.h> @@ -104,17 +105,18 @@ static unsigned char oui_802_2[] = { 0x00, 0x80, 0xC2 }; #endif #ifndef MODULE - -int wanrouter_init(void) +__initfunc(int wanrouter_init(void)) { int err; - extern void wanpipe_init(void); + extern int wanpipe_init(void), + cyclomx_init(void); printk(KERN_INFO "%s v%u.%u %s\n", fullname, ROUTER_VERSION, ROUTER_RELEASE, copyright); err = wanrouter_proc_init(); if (err) - printk(KERN_ERR "%s: can't create entry in proc filesystem!\n", modname); + printk(KERN_ERR "%s: can't create entry in proc filesystem!\n", + modname); /* * Initialise compiled in boards @@ -123,6 +125,9 @@ int wanrouter_init(void) #ifdef CONFIG_VENDOR_SANGOMA wanpipe_init(); #endif +#ifdef CONFIG_CYCLADES_SYNC + cyclomx_init(); +#endif return err; } @@ -187,7 +192,6 @@ void cleanup_module (void) * Context: process */ - int register_wan_device(wan_device_t* wandev) { int err, namelen; @@ -207,7 +211,6 @@ int register_wan_device(wan_device_t* wandev) printk(KERN_INFO "%s: registering WAN device %s\n", modname, wandev->name); #endif - /* * Register /proc directory entry */ |