vserver 2.0 rc7

[linux-2.6.git] / net / bridge / br.c

diff --git a/net/bridge/br.c b/net/bridge/br.c
index 675d070..f8f1849 100644 (file)
--- a/net/bridge/br.c
+++ b/net/bridge/br.c
@@ -16,17 +16,12 @@
 #include <linux/config.h>
 #include <linux/module.h>
 #include <linux/kernel.h>
-#include <linux/miscdevice.h>
 #include <linux/netdevice.h>
 #include <linux/etherdevice.h>
 #include <linux/init.h>
 
 #include "br_private.h"
 
-#if defined(CONFIG_ATM_LANE) || defined(CONFIG_ATM_LANE_MODULE)
-#include "../atm/lec.h"
-#endif
-
 int (*br_should_route_hook) (struct sk_buff **pskb) = NULL;
 
 static int __init br_init(void)
@@ -40,10 +35,9 @@ static int __init br_init(void)
        brioctl_set(br_ioctl_deviceless_stub);
        br_handle_frame_hook = br_handle_frame;
 
-#if defined(CONFIG_ATM_LANE) || defined(CONFIG_ATM_LANE_MODULE)
        br_fdb_get_hook = br_fdb_get;
        br_fdb_put_hook = br_fdb_put;
-#endif
+
        register_netdevice_notifier(&br_device_notifier);
 
        return 0;
@@ -61,10 +55,8 @@ static void __exit br_deinit(void)
 
        synchronize_net();
 
-#if defined(CONFIG_ATM_LANE) || defined(CONFIG_ATM_LANE_MODULE)
        br_fdb_get_hook = NULL;
        br_fdb_put_hook = NULL;
-#endif
 
        br_handle_frame_hook = NULL;
        br_fdb_fini();