diff options
| author | Takashi Iwai <tiwai@suse.de> | 2012-01-31 09:13:14 -0500 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2012-01-31 09:13:14 -0500 |
| commit | ea51e5040e24eefe44d70bc654a237ca1f0225b0 (patch) | |
| tree | df2e5922dcdfafae62a10d8cd97f98121064fc23 /include/sound | |
| parent | 3422a47041b8cb8f14ac1e3926bcf711121df6dc (diff) | |
| parent | 8dbd52daee38adaae4d5a674bcca837e694a4f4c (diff) | |
Merge branch 'fix/asoc' into for-linus
Diffstat (limited to 'include/sound')
| -rw-r--r-- | include/sound/info.h | 2 | ||||
| -rw-r--r-- | include/sound/saif.h | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/include/sound/info.h b/include/sound/info.h index 5492cc40dc57..9ca1a493d370 100644 --- a/include/sound/info.h +++ b/include/sound/info.h | |||
| @@ -72,7 +72,7 @@ struct snd_info_entry_ops { | |||
| 72 | 72 | ||
| 73 | struct snd_info_entry { | 73 | struct snd_info_entry { |
| 74 | const char *name; | 74 | const char *name; |
| 75 | mode_t mode; | 75 | umode_t mode; |
| 76 | long size; | 76 | long size; |
| 77 | unsigned short content; | 77 | unsigned short content; |
| 78 | union { | 78 | union { |
diff --git a/include/sound/saif.h b/include/sound/saif.h index d0e0de7984ec..f22f3e16edf4 100644 --- a/include/sound/saif.h +++ b/include/sound/saif.h | |||
| @@ -10,7 +10,7 @@ | |||
| 10 | #define __SOUND_SAIF_H__ | 10 | #define __SOUND_SAIF_H__ |
| 11 | 11 | ||
| 12 | struct mxs_saif_platform_data { | 12 | struct mxs_saif_platform_data { |
| 13 | int (*init) (void); | 13 | bool master_mode; /* if true use master mode */ |
| 14 | int (*get_master_id) (unsigned int saif_id); | 14 | int master_id; /* id of the master if in slave mode */ |
| 15 | }; | 15 | }; |
| 16 | #endif | 16 | #endif |