diff options
Diffstat (limited to 'include/sound')
-rw-r--r-- | include/sound/core.h | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/include/sound/core.h b/include/sound/core.h index f557c8ac450e..67b0a7e764e7 100644 --- a/include/sound/core.h +++ b/include/sound/core.h | |||
@@ -183,9 +183,8 @@ static inline int snd_power_wait(struct snd_card *card, unsigned int state, stru | |||
183 | #endif /* CONFIG_PM */ | 183 | #endif /* CONFIG_PM */ |
184 | 184 | ||
185 | struct snd_minor { | 185 | struct snd_minor { |
186 | struct list_head list; /* list of all minors per card */ | ||
187 | int number; /* minor number */ | ||
188 | int type; /* SNDRV_DEVICE_TYPE_XXX */ | 186 | int type; /* SNDRV_DEVICE_TYPE_XXX */ |
187 | int card; /* card number */ | ||
189 | int device; /* device number */ | 188 | int device; /* device number */ |
190 | struct file_operations *f_ops; /* file operations */ | 189 | struct file_operations *f_ops; /* file operations */ |
191 | char name[0]; /* device name (keep at the end of | 190 | char name[0]; /* device name (keep at the end of |
@@ -217,11 +216,9 @@ int snd_minor_info_done(void); | |||
217 | #ifdef CONFIG_SND_OSSEMUL | 216 | #ifdef CONFIG_SND_OSSEMUL |
218 | int snd_minor_info_oss_init(void); | 217 | int snd_minor_info_oss_init(void); |
219 | int snd_minor_info_oss_done(void); | 218 | int snd_minor_info_oss_done(void); |
220 | int snd_oss_init_module(void); | ||
221 | #else | 219 | #else |
222 | #define snd_minor_info_oss_init() /*NOP*/ | 220 | #define snd_minor_info_oss_init() /*NOP*/ |
223 | #define snd_minor_info_oss_done() /*NOP*/ | 221 | #define snd_minor_info_oss_done() /*NOP*/ |
224 | #define snd_oss_init_module() 0 | ||
225 | #endif | 222 | #endif |
226 | 223 | ||
227 | /* memory.c */ | 224 | /* memory.c */ |