X-Git-Url: https://git.openpandora.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=sound%2Foss%2Fdev_table.h;h=b7617bee6388f13be8fa4bf842c6c88990faef90;hb=7f3af60e5a444b287d740a84998a8f480645dadf;hp=adf1d625b576cc19af1bc7b574690ae7c5cf5e9b;hpb=1da177e4c3f41524e886b7f1b8a0c1fc7321cac2;p=pandora-kernel.git 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 void (*arm_timer)(int dev, long time); }; -#ifdef _DEV_TABLE_C_ -struct audio_operations *audio_devs[MAX_AUDIO_DEV]; -int num_audiodevs; -struct mixer_operations *mixer_devs[MAX_MIXER_DEV]; -int num_mixers; -struct synth_operations *synth_devs[MAX_SYNTH_DEV+MAX_MIDI_DEV]; -int num_synths; -struct midi_operations *midi_devs[MAX_MIDI_DEV]; -int num_midis; - extern struct sound_timer_operations default_sound_timer; -struct sound_timer_operations *sound_timer_devs[MAX_TIMER_DEV] = { - &default_sound_timer, NULL -}; -int num_sound_timers = 1; -#else + extern struct audio_operations *audio_devs[MAX_AUDIO_DEV]; extern int num_audiodevs; extern struct mixer_operations *mixer_devs[MAX_MIXER_DEV]; @@ -378,7 +364,6 @@ extern struct midi_operations *midi_devs[MAX_MIDI_DEV]; extern int num_midis; extern struct sound_timer_operations * sound_timer_devs[MAX_TIMER_DEV]; extern int num_sound_timers; -#endif /* _DEV_TABLE_C_ */ extern int sound_map_buffer (int dev, struct dma_buffparms *dmap, buffmem_desc *info); void sound_timer_init (struct sound_lowlev_timer *t, char *name);