diff options
-rw-r--r-- | net/atm/mpc.c | 11 | ||||
-rw-r--r-- | net/atm/mpc.h | 8 |
2 files changed, 8 insertions, 11 deletions
diff --git a/net/atm/mpc.c b/net/atm/mpc.c index 00704661e83f..b87c2a88bdce 100644 --- a/net/atm/mpc.c +++ b/net/atm/mpc.c | |||
@@ -98,11 +98,6 @@ static struct notifier_block mpoa_notifier = { | |||
98 | 0 | 98 | 0 |
99 | }; | 99 | }; |
100 | 100 | ||
101 | #ifdef CONFIG_PROC_FS | ||
102 | extern int mpc_proc_init(void); | ||
103 | extern void mpc_proc_clean(void); | ||
104 | #endif | ||
105 | |||
106 | struct mpoa_client *mpcs = NULL; /* FIXME */ | 101 | struct mpoa_client *mpcs = NULL; /* FIXME */ |
107 | static struct atm_mpoa_qos *qos_head = NULL; | 102 | static struct atm_mpoa_qos *qos_head = NULL; |
108 | static DEFINE_TIMER(mpc_timer, NULL, 0, 0); | 103 | static DEFINE_TIMER(mpc_timer, NULL, 0, 0); |
@@ -1439,12 +1434,8 @@ static __init int atm_mpoa_init(void) | |||
1439 | { | 1434 | { |
1440 | register_atm_ioctl(&atm_ioctl_ops); | 1435 | register_atm_ioctl(&atm_ioctl_ops); |
1441 | 1436 | ||
1442 | #ifdef CONFIG_PROC_FS | ||
1443 | if (mpc_proc_init() != 0) | 1437 | if (mpc_proc_init() != 0) |
1444 | printk(KERN_INFO "mpoa: failed to initialize /proc/mpoa\n"); | 1438 | printk(KERN_INFO "mpoa: failed to initialize /proc/mpoa\n"); |
1445 | else | ||
1446 | printk(KERN_INFO "mpoa: /proc/mpoa initialized\n"); | ||
1447 | #endif | ||
1448 | 1439 | ||
1449 | printk("mpc.c: " __DATE__ " " __TIME__ " initialized\n"); | 1440 | printk("mpc.c: " __DATE__ " " __TIME__ " initialized\n"); |
1450 | 1441 | ||
@@ -1457,9 +1448,7 @@ static void __exit atm_mpoa_cleanup(void) | |||
1457 | struct atm_mpoa_qos *qos, *nextqos; | 1448 | struct atm_mpoa_qos *qos, *nextqos; |
1458 | struct lec_priv *priv; | 1449 | struct lec_priv *priv; |
1459 | 1450 | ||
1460 | #ifdef CONFIG_PROC_FS | ||
1461 | mpc_proc_clean(); | 1451 | mpc_proc_clean(); |
1462 | #endif | ||
1463 | 1452 | ||
1464 | del_timer(&mpc_timer); | 1453 | del_timer(&mpc_timer); |
1465 | unregister_netdevice_notifier(&mpoa_notifier); | 1454 | unregister_netdevice_notifier(&mpoa_notifier); |
diff --git a/net/atm/mpc.h b/net/atm/mpc.h index 863ddf6079e1..3c7981a229e8 100644 --- a/net/atm/mpc.h +++ b/net/atm/mpc.h | |||
@@ -50,4 +50,12 @@ int atm_mpoa_delete_qos(struct atm_mpoa_qos *qos); | |||
50 | struct seq_file; | 50 | struct seq_file; |
51 | void atm_mpoa_disp_qos(struct seq_file *m); | 51 | void atm_mpoa_disp_qos(struct seq_file *m); |
52 | 52 | ||
53 | #ifdef CONFIG_PROC_FS | ||
54 | int mpc_proc_init(void); | ||
55 | void mpc_proc_clean(void); | ||
56 | #else | ||
57 | #define mpc_proc_init() (0) | ||
58 | #define mpc_proc_clean() do { } while(0) | ||
59 | #endif | ||
60 | |||
53 | #endif /* _MPC_H_ */ | 61 | #endif /* _MPC_H_ */ |