diff options
| author |   Takashi Iwai <tiwai@suse.de> | 2015-02-03 17:57:16 +0100 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2015-02-03 17:57:16 +0100 |
| commit | 3fe9cf390f6dc84f76b112b0a660967a84f9a81b (patch) | |
| tree | 18b8573687ae8131db155aa791f4d2357d91e6c5 /include/sound/compress_driver.h | |
| parent | ALSA: line6: fixup of line6_start_timer argument type (diff) | |
| parent | ALSA: Drop snd_get_device() helper (diff) | |
| download | wireguard-linux-3fe9cf390f6dc84f76b112b0a660967a84f9a81b.tar.xz wireguard-linux-3fe9cf390f6dc84f76b112b0a660967a84f9a81b.zip | |
Merge branch 'topic/snd-device' into for-next
Diffstat (limited to 'include/sound/compress_driver.h')
| -rw-r--r-- | include/sound/compress_driver.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/include/sound/compress_driver.h b/include/sound/compress_driver.h index 1e2531058b7e..f48089d364c5 100644 --- a/include/sound/compress_driver.h +++ b/include/sound/compress_driver.h @@ -135,7 +135,7 @@ struct snd_compr_ops { /** * struct snd_compr: Compressed device * @name: DSP device name - * @dev: Device pointer + * @dev: associated device instance * @ops: pointer to DSP callbacks * @private_data: pointer to DSP pvt data * @card: sound card pointer @@ -145,7 +145,7 @@ struct snd_compr_ops { */ struct snd_compr { const char *name; - struct device *dev; + struct device dev; struct snd_compr_ops *ops; void *private_data; struct snd_card *card; |