diff options
| author | Takashi Iwai <tiwai@suse.de> | 2015-02-03 11:57:16 -0500 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2015-02-03 11:57:16 -0500 |
| commit | 3fe9cf390f6dc84f76b112b0a660967a84f9a81b (patch) | |
| tree | 18b8573687ae8131db155aa791f4d2357d91e6c5 /include/sound/compress_driver.h | |
| parent | 6ccd93bdb989507717edb375d40534f1177822c5 (diff) | |
| parent | 830953c0724b42be30a74febcde6c89c706ed286 (diff) | |
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 { | |||
| 135 | /** | 135 | /** |
| 136 | * struct snd_compr: Compressed device | 136 | * struct snd_compr: Compressed device |
| 137 | * @name: DSP device name | 137 | * @name: DSP device name |
| 138 | * @dev: Device pointer | 138 | * @dev: associated device instance |
| 139 | * @ops: pointer to DSP callbacks | 139 | * @ops: pointer to DSP callbacks |
| 140 | * @private_data: pointer to DSP pvt data | 140 | * @private_data: pointer to DSP pvt data |
| 141 | * @card: sound card pointer | 141 | * @card: sound card pointer |
| @@ -145,7 +145,7 @@ struct snd_compr_ops { | |||
| 145 | */ | 145 | */ |
| 146 | struct snd_compr { | 146 | struct snd_compr { |
| 147 | const char *name; | 147 | const char *name; |
| 148 | struct device *dev; | 148 | struct device dev; |
| 149 | struct snd_compr_ops *ops; | 149 | struct snd_compr_ops *ops; |
| 150 | void *private_data; | 150 | void *private_data; |
| 151 | struct snd_card *card; | 151 | struct snd_card *card; |