Merge branch 'topic/snd-device' into for-next

This commit is contained in:
Takashi Iwai
2015-02-03 17:57:16 +01:00
238 changed files with 2633 additions and 1600 deletions

View File

@@ -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;