diff options
| author | Ralf Baechle <ralf@linux-mips.org> | 2000-01-27 01:05:20 +0000 |
|---|---|---|
| committer | Ralf Baechle <ralf@linux-mips.org> | 2000-01-27 01:05:20 +0000 |
| commit | 546db14ee74118296f425f3b91634fb767d67290 (patch) | |
| tree | 22b613a3da8d4bf663eec5e155af01b87fdf9094 /drivers/net/hamradio | |
| parent | 1e25e41c4f5474e14452094492dbc169b800e4c8 (diff) | |
Merge with Linux 2.3.23. The new bootmem stuff has broken various
platforms. At this time I've only verified that IP22 support compiles
and IP27 actually works.
Diffstat (limited to 'drivers/net/hamradio')
| -rw-r--r-- | drivers/net/hamradio/baycom_par.c | 2 | ||||
| -rw-r--r-- | drivers/net/hamradio/soundmodem/sm.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/drivers/net/hamradio/baycom_par.c b/drivers/net/hamradio/baycom_par.c index 9ba70b255..0bd2a1725 100644 --- a/drivers/net/hamradio/baycom_par.c +++ b/drivers/net/hamradio/baycom_par.c @@ -572,7 +572,7 @@ module_exit(cleanup_baycompar); static int __init baycom_par_setup(char *str) { - static unsigned __initdata nr_dev = 0; + static unsigned nr_dev = 0; int ints[2]; if (nr_dev >= NR_PORTS) diff --git a/drivers/net/hamradio/soundmodem/sm.c b/drivers/net/hamradio/soundmodem/sm.c index 99d9061f9..6fa4aca6b 100644 --- a/drivers/net/hamradio/soundmodem/sm.c +++ b/drivers/net/hamradio/soundmodem/sm.c @@ -726,7 +726,7 @@ module_exit(cleanup_soundmodem); static int __init sm_setup(char *str) { - static unsigned __initdata nr_dev = 0; + static unsigned nr_dev = 0; int ints[8]; if (nr_dev >= NR_PORTS) |