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/sound/es1370.c | |
| parent | fa9bdb574f4febb751848a685d9a9017e04e1d53 (diff) | |
Merge with Linux 2.4.0-test10.
Diffstat (limited to 'drivers/sound/es1370.c')
| -rw-r--r-- | drivers/sound/es1370.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/drivers/sound/es1370.c b/drivers/sound/es1370.c index 72f3e569b..f7ce193f0 100644 --- a/drivers/sound/es1370.c +++ b/drivers/sound/es1370.c @@ -109,7 +109,6 @@ * 12.08.1999 0.27 module_init/__setup fixes * 19.08.1999 0.28 SOUND_MIXER_IMIX fixes, reported by Gianluca <gialluca@mail.tiscalinet.it> * 31.08.1999 0.29 add spin_lock_init - * __initlocaldata to fix gcc 2.7.x problems * replaced current->state = x with set_current_state(x) * 03.09.1999 0.30 change read semantics for MIDI to match * OSS more closely; remove possible wakeup race @@ -2677,7 +2676,7 @@ module_exit(cleanup_es1370); static int __init es1370_setup(char *str) { - static unsigned __initlocaldata nr_dev = 0; + static unsigned __initdata nr_dev = 0; if (nr_dev >= NR_DEVICE) return 0; |