diff options
| author | Kai Germaschewski <kai@tp1.ruhr-uni-bochum.de> | 2002-06-18 08:06:03 -0500 |
|---|---|---|
| committer | Kai Germaschewski <kai@tp1.ruhr-uni-bochum.de> | 2002-06-18 08:06:03 -0500 |
| commit | faf49a92ec0b48f374780e04755b3ecdaad35fd4 (patch) | |
| tree | 6e1227886169d3d60b00c7d9b58f474429cc5c25 /net/core/dev.c | |
| parent | a79b7643ee1ccecb1378522fe28e456f6f4d68cb (diff) | |
| parent | c7165d9a3fd5773c1374c1ad7ff8513abc61ed39 (diff) | |
Merge tp1.ruhr-uni-bochum.de:/home/kai/kernel/v2.5/linux-2.5.make
into tp1.ruhr-uni-bochum.de:/home/kai/kernel/v2.5/linux-2.5.make-net
Diffstat (limited to 'net/core/dev.c')
| -rw-r--r-- | net/core/dev.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/net/core/dev.c b/net/core/dev.c index 590d77ed78ab..c9166681c226 100644 --- a/net/core/dev.c +++ b/net/core/dev.c @@ -2427,7 +2427,7 @@ static int dev_boot_phase = 1; * will not get the same name. */ -int net_dev_init(void); +static int net_dev_init(void); int register_netdevice(struct net_device *dev) { @@ -2693,7 +2693,7 @@ extern void dv_init(void); * Callers must hold the rtnl semaphore. See the comment at the * end of Space.c for details about the locking. */ -int __init net_dev_init(void) +static int __init net_dev_init(void) { struct net_device *dev, **dp; int i; @@ -2834,6 +2834,8 @@ int __init net_dev_init(void) return 0; } +__initcall(net_dev_init); + #ifdef CONFIG_HOTPLUG /* Notify userspace when a netdevice event occurs, |