diff options
Diffstat (limited to 'sound/oss/dev_table.h')
-rw-r--r-- | sound/oss/dev_table.h | 17 |
1 files changed, 1 insertions, 16 deletions
diff --git a/sound/oss/dev_table.h b/sound/oss/dev_table.h index adf1d625b576..b7617bee6388 100644 --- a/sound/oss/dev_table.h +++ b/sound/oss/dev_table.h | |||
@@ -352,22 +352,8 @@ struct sound_timer_operations | |||
352 | void (*arm_timer)(int dev, long time); | 352 | void (*arm_timer)(int dev, long time); |
353 | }; | 353 | }; |
354 | 354 | ||
355 | #ifdef _DEV_TABLE_C_ | ||
356 | struct audio_operations *audio_devs[MAX_AUDIO_DEV]; | ||
357 | int num_audiodevs; | ||
358 | struct mixer_operations *mixer_devs[MAX_MIXER_DEV]; | ||
359 | int num_mixers; | ||
360 | struct synth_operations *synth_devs[MAX_SYNTH_DEV+MAX_MIDI_DEV]; | ||
361 | int num_synths; | ||
362 | struct midi_operations *midi_devs[MAX_MIDI_DEV]; | ||
363 | int num_midis; | ||
364 | |||
365 | extern struct sound_timer_operations default_sound_timer; | 355 | extern struct sound_timer_operations default_sound_timer; |
366 | struct sound_timer_operations *sound_timer_devs[MAX_TIMER_DEV] = { | 356 | |
367 | &default_sound_timer, NULL | ||
368 | }; | ||
369 | int num_sound_timers = 1; | ||
370 | #else | ||
371 | extern struct audio_operations *audio_devs[MAX_AUDIO_DEV]; | 357 | extern struct audio_operations *audio_devs[MAX_AUDIO_DEV]; |
372 | extern int num_audiodevs; | 358 | extern int num_audiodevs; |
373 | extern struct mixer_operations *mixer_devs[MAX_MIXER_DEV]; | 359 | extern struct mixer_operations *mixer_devs[MAX_MIXER_DEV]; |
@@ -378,7 +364,6 @@ extern struct midi_operations *midi_devs[MAX_MIDI_DEV]; | |||
378 | extern int num_midis; | 364 | extern int num_midis; |
379 | extern struct sound_timer_operations * sound_timer_devs[MAX_TIMER_DEV]; | 365 | extern struct sound_timer_operations * sound_timer_devs[MAX_TIMER_DEV]; |
380 | extern int num_sound_timers; | 366 | extern int num_sound_timers; |
381 | #endif /* _DEV_TABLE_C_ */ | ||
382 | 367 | ||
383 | extern int sound_map_buffer (int dev, struct dma_buffparms *dmap, buffmem_desc *info); | 368 | extern int sound_map_buffer (int dev, struct dma_buffparms *dmap, buffmem_desc *info); |
384 | void sound_timer_init (struct sound_lowlev_timer *t, char *name); | 369 | void sound_timer_init (struct sound_lowlev_timer *t, char *name); |