diff options
| author | Kevin Hilman <khilman@linaro.org> | 2015-08-14 09:45:22 -0700 |
|---|---|---|
| committer | Kevin Hilman <khilman@linaro.org> | 2015-08-14 09:55:00 -0700 |
| commit | 4dddf720534a9a14fa9b048e7930dcc55b1b1e40 (patch) | |
| tree | 6dead0bf02a9c08038d3238b1599823a25d9e881 /sound/soc/codecs/wm8903.h | |
| parent | a93bdb5f55d343fb51892050ed49da9d476da18a (diff) | |
| parent | 07818b5b1ba0f494a7255ab634bad2dd2b908ed0 (diff) | |
Merge branch 'linux-linaro-lsk-v3.10' into linux-linaro-lsk-v3.10-androidlsk-v3.10-15.08-android
Conflicts:
fs/exec.c
Resolution summary:
Conflict between upstream/LTS commit 9eae8ac6ab40 (fs: take
i_mutex during prepare_binprm for set[ug]id executables) and
android commit 9d0ff694bc22 (sched: move no_new_privs into new
atomic flags). Resolution: move task_no_new_privs() usage into
new function created by upstream/LTS comit.
Diffstat (limited to 'sound/soc/codecs/wm8903.h')
| -rw-r--r-- | sound/soc/codecs/wm8903.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sound/soc/codecs/wm8903.h b/sound/soc/codecs/wm8903.h index db949311c0f2..0bb4a647755d 100644 --- a/sound/soc/codecs/wm8903.h +++ b/sound/soc/codecs/wm8903.h @@ -172,7 +172,7 @@ extern int wm8903_mic_detect(struct snd_soc_codec *codec, #define WM8903_VMID_BUF_ENA_WIDTH 1 /* VMID_BUF_ENA */ #define WM8903_VMID_RES_50K 2 -#define WM8903_VMID_RES_250K 3 +#define WM8903_VMID_RES_250K 4 #define WM8903_VMID_RES_5K 6 /* |