diff options
| author | Ralf Baechle <ralf@linux-mips.org> | 2000-11-23 02:00:47 +0000 |
|---|---|---|
| committer | Ralf Baechle <ralf@linux-mips.org> | 2000-11-23 02:00:47 +0000 |
| commit | 06615f62b17d7de6e12d2f5ec6b88cf30af08413 (patch) | |
| tree | 8766f208847d4876a6db619aebbf54d53b76eb44 /drivers/net/hamradio | |
| parent | fa9bdb574f4febb751848a685d9a9017e04e1d53 (diff) | |
Merge with Linux 2.4.0-test10.
Diffstat (limited to 'drivers/net/hamradio')
| -rw-r--r-- | drivers/net/hamradio/Makefile | 2 | ||||
| -rw-r--r-- | drivers/net/hamradio/baycom_epp.c | 2 | ||||
| -rw-r--r-- | drivers/net/hamradio/bpqether.c | 2 | ||||
| -rw-r--r-- | drivers/net/hamradio/scc.c | 10 |
4 files changed, 8 insertions, 8 deletions
diff --git a/drivers/net/hamradio/Makefile b/drivers/net/hamradio/Makefile index 7ca3c1efd..3c5e330b5 100644 --- a/drivers/net/hamradio/Makefile +++ b/drivers/net/hamradio/Makefile @@ -4,7 +4,7 @@ # # 19971130 Moved the amateur radio related network drivers from # drivers/net/ to drivers/hamradio for easier maintainance. -# Joerg Reuter DL1BKE <jreuter@poboxes.com> +# Joerg Reuter DL1BKE <jreuter@yaina.de> # # 20000806 Rewritten to use lists instead of if-statements. # Christoph Hellwig <hch@caldera.de> diff --git a/drivers/net/hamradio/baycom_epp.c b/drivers/net/hamradio/baycom_epp.c index cd6815df7..4e1bb8bf0 100644 --- a/drivers/net/hamradio/baycom_epp.c +++ b/drivers/net/hamradio/baycom_epp.c @@ -1506,7 +1506,7 @@ module_exit(cleanup_baycomepp); static int __init baycom_epp_setup(char *str) { - static unsigned __initlocaldata nr_dev = 0; + static unsigned __initdata nr_dev = 0; int ints[2]; if (nr_dev >= NR_PORTS) diff --git a/drivers/net/hamradio/bpqether.c b/drivers/net/hamradio/bpqether.c index 6319f983d..5f765d5bf 100644 --- a/drivers/net/hamradio/bpqether.c +++ b/drivers/net/hamradio/bpqether.c @@ -652,7 +652,7 @@ static void __exit bpq_cleanup_driver(void) unregister_netdev(&bpq->axdev); } -MODULE_AUTHOR("Joerg Reuter DL1BKE <jreuter@poboxes.com>"); +MODULE_AUTHOR("Joerg Reuter DL1BKE <jreuter@yaina.de>"); MODULE_DESCRIPTION("Transmit and receive AX.25 packets over Ethernet"); module_init(bpq_init_driver); module_exit(bpq_cleanup_driver); diff --git a/drivers/net/hamradio/scc.c b/drivers/net/hamradio/scc.c index 99d8c65aa..2ea55b0f1 100644 --- a/drivers/net/hamradio/scc.c +++ b/drivers/net/hamradio/scc.c @@ -130,9 +130,9 @@ vy 73, Joerg Reuter ampr-net: dl1bke@db0pra.ampr.org - AX-25 : DL1BKE @ DB0ACH.#NRW.DEU.EU - Internet: jreuter@poboxes.com - www : http://poboxes.com/jreuter/ + AX-25 : DL1BKE @ DB0ABH.#BAY.DEU.EU + Internet: jreuter@yaina.de + www : http://yaina.de/jreuter */ /* ----------------------------------------------------------------------- */ @@ -2226,8 +2226,8 @@ static void __exit scc_cleanup_driver(void) scc_net_procfs_remove(); } -MODULE_AUTHOR("Joerg Reuter <jreuter@poboxes.com>"); +MODULE_AUTHOR("Joerg Reuter <jreuter@yaina.de>"); MODULE_DESCRIPTION("AX.25 Device Driver for Z8530 based HDLC cards"); -MODULE_SUPPORTED_DEVICE("scc"); +MODULE_SUPPORTED_DEVICE("Z8530 based SCC cards for Amateur Radio"); module_init(scc_init_driver); module_exit(scc_cleanup_driver); |