diff options
Diffstat (limited to 'include/sound/core.h')
-rw-r--r-- | include/sound/core.h | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/include/sound/core.h b/include/sound/core.h index 3dc41fd5c54d..26160adcdffc 100644 --- a/include/sound/core.h +++ b/include/sound/core.h | |||
@@ -168,6 +168,9 @@ struct _snd_card { | |||
168 | wait_queue_head_t shutdown_sleep; | 168 | wait_queue_head_t shutdown_sleep; |
169 | struct work_struct free_workq; /* for free in workqueue */ | 169 | struct work_struct free_workq; /* for free in workqueue */ |
170 | struct device *dev; | 170 | struct device *dev; |
171 | #ifdef CONFIG_SND_GENERIC_DRIVER | ||
172 | struct snd_generic_device *generic_dev; | ||
173 | #endif | ||
171 | 174 | ||
172 | #ifdef CONFIG_PM | 175 | #ifdef CONFIG_PM |
173 | int (*pm_suspend)(snd_card_t *card, pm_message_t state); | 176 | int (*pm_suspend)(snd_card_t *card, pm_message_t state); |
@@ -176,9 +179,6 @@ struct _snd_card { | |||
176 | unsigned int power_state; /* power state */ | 179 | unsigned int power_state; /* power state */ |
177 | struct semaphore power_lock; /* power lock */ | 180 | struct semaphore power_lock; /* power lock */ |
178 | wait_queue_head_t power_sleep; | 181 | wait_queue_head_t power_sleep; |
179 | #ifdef CONFIG_SND_GENERIC_PM | ||
180 | struct snd_generic_device *pm_dev; /* for ISA */ | ||
181 | #endif | ||
182 | #endif | 182 | #endif |
183 | 183 | ||
184 | #if defined(CONFIG_SND_MIXER_OSS) || defined(CONFIG_SND_MIXER_OSS_MODULE) | 184 | #if defined(CONFIG_SND_MIXER_OSS) || defined(CONFIG_SND_MIXER_OSS_MODULE) |
@@ -348,6 +348,8 @@ int snd_card_file_remove(snd_card_t *card, struct file *file); | |||
348 | #ifndef snd_card_set_dev | 348 | #ifndef snd_card_set_dev |
349 | #define snd_card_set_dev(card,devptr) ((card)->dev = (devptr)) | 349 | #define snd_card_set_dev(card,devptr) ((card)->dev = (devptr)) |
350 | #endif | 350 | #endif |
351 | /* register a generic device (for ISA, etc) */ | ||
352 | int snd_card_set_generic_dev(snd_card_t *card); | ||
351 | 353 | ||
352 | /* device.c */ | 354 | /* device.c */ |
353 | 355 | ||