diff options
| author | Gary King <gking@nvidia.com> | 2010-02-18 15:26:30 -0800 |
|---|---|---|
| committer | Gerrit Code Review <gerrit2@git-master-01.nvidia.com> | 2010-02-18 15:26:30 -0800 |
| commit | 2dd8af188e4dd01691f49d689bf24a4fd89927b1 (patch) | |
| tree | bf56614e7c201611848d3e1c6d5a081756bae2e4 /sound | |
| parent | 7e0659456cf2634be6a6d1689a3cf74c8de0e839 (diff) | |
| parent | e81a1aea26161b480dddfc6e394f42a66fefa8ad (diff) | |
Merge "[ALSA]Adding PowerState and EndOfStream properties" into android-tegra-2.6.29
Diffstat (limited to 'sound')
| -rw-r--r-- | sound/soc/tegra/tegra_sndfx.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/sound/soc/tegra/tegra_sndfx.h b/sound/soc/tegra/tegra_sndfx.h index 1e9bb82940a4..bf33d95a495c 100644 --- a/sound/soc/tegra/tegra_sndfx.h +++ b/sound/soc/tegra/tegra_sndfx.h @@ -146,6 +146,7 @@ typedef enum NvAudioFxProperty_Detach, NvAudioFxProperty_Format, NvAudioFxProperty_Method, + NvAudioFxProperty_PowerState, NvAudioFxProperty_SampleRate, NvAudioFxProperty_State, NvAudioFxPinProperty_Format, @@ -239,6 +240,7 @@ typedef enum NvAudioFxState_Run, NvAudioFxState_Pause, NvAudioFxState_Disable, + NvAudioFxState_EndOfStream, NvAudioFxState_Num, NvAudioFxState_Force32 = 0x7FFFFFFF } NvAudioFxState; |