diff options
| author | Takashi Iwai <tiwai@suse.de> | 2014-01-20 10:20:14 +0100 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2014-01-20 10:20:14 +0100 |
| commit | 258753361534a40ad7180c742da813fc659e427b (patch) | |
| tree | 58517f6ce46ab2c897d427b7d1bf29850be314fa /include/sound/rcar_snd.h | |
| parent | 315fba80a664e4bd928e0b85a38d26e60645b96a (diff) | |
| parent | 2aff4c9ce898b9079658650c1ab33c44b100a203 (diff) | |
Merge branch 'for-next' into for-linus
Diffstat (limited to 'include/sound/rcar_snd.h')
| -rw-r--r-- | include/sound/rcar_snd.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/include/sound/rcar_snd.h b/include/sound/rcar_snd.h index 12afab18945d..e147498abe50 100644 --- a/include/sound/rcar_snd.h +++ b/include/sound/rcar_snd.h @@ -18,7 +18,7 @@ #define RSND_GEN1_ADG 1 #define RSND_GEN1_SSI 2 -#define RSND_GEN2_SRU 0 +#define RSND_GEN2_SCU 0 #define RSND_GEN2_ADG 1 #define RSND_GEN2_SSIU 2 #define RSND_GEN2_SSI 3 @@ -58,6 +58,7 @@ struct rsnd_ssi_platform_info { struct rsnd_scu_platform_info { u32 flags; + u32 convert_rate; /* sampling rate convert */ }; /* |