diff options
| author | David Woodhouse <dwmw2@infradead.org> | 2007-08-23 05:43:14 -0400 |
|---|---|---|
| committer | David Woodhouse <dwmw2@infradead.org> | 2007-08-23 05:43:14 -0400 |
| commit | ac0c955d5048c2c580fa7166a89133f0fd76c125 (patch) | |
| tree | 041ac4fb544c7244a1a0b35c8ceabc142d5645c1 /net/econet | |
| parent | 68d09b1b6780415d82160f6b6d88e82bd724e691 (diff) | |
| parent | b377fd3982ad957c796758a90e2988401a884241 (diff) | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
Diffstat (limited to 'net/econet')
| -rw-r--r-- | net/econet/af_econet.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/net/econet/af_econet.c b/net/econet/af_econet.c index b5524f32ac2d..35c96bcc0f32 100644 --- a/net/econet/af_econet.c +++ b/net/econet/af_econet.c | |||
| @@ -1146,6 +1146,9 @@ static void __exit econet_proto_exit(void) | |||
| 1146 | sock_release(udpsock); | 1146 | sock_release(udpsock); |
| 1147 | #endif | 1147 | #endif |
| 1148 | unregister_netdevice_notifier(&econet_netdev_notifier); | 1148 | unregister_netdevice_notifier(&econet_netdev_notifier); |
| 1149 | #ifdef CONFIG_ECONET_NATIVE | ||
| 1150 | dev_remove_pack(&econet_packet_type); | ||
| 1151 | #endif | ||
| 1149 | sock_unregister(econet_family_ops.family); | 1152 | sock_unregister(econet_family_ops.family); |
| 1150 | proto_unregister(&econet_proto); | 1153 | proto_unregister(&econet_proto); |
| 1151 | } | 1154 | } |