diff options
| author | Jiri Kosina <jkosina@suse.cz> | 2009-12-07 12:36:35 -0500 |
|---|---|---|
| committer | Jiri Kosina <jkosina@suse.cz> | 2009-12-07 12:36:35 -0500 |
| commit | d014d043869cdc591f3a33243d3481fa4479c2d0 (patch) | |
| tree | 63626829498e647ba058a1ce06419fe7e4d5f97d /include/sound/wm8993.h | |
| parent | 6ec22f9b037fc0c2e00ddb7023fad279c365324d (diff) | |
| parent | 6070d81eb5f2d4943223c96e7609a53cdc984364 (diff) | |
Merge branch 'for-next' into for-linus
Conflicts:
kernel/irq/chip.c
Diffstat (limited to 'include/sound/wm8993.h')
| -rw-r--r-- | include/sound/wm8993.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/sound/wm8993.h b/include/sound/wm8993.h index 9c661f2f8cda..eee19f63c0d8 100644 --- a/include/sound/wm8993.h +++ b/include/sound/wm8993.h | |||
| @@ -36,7 +36,7 @@ struct wm8993_platform_data { | |||
| 36 | unsigned int micbias1_lvl:1; | 36 | unsigned int micbias1_lvl:1; |
| 37 | unsigned int micbias2_lvl:1; | 37 | unsigned int micbias2_lvl:1; |
| 38 | 38 | ||
| 39 | /* Jack detect threashold levels, see datasheet for values */ | 39 | /* Jack detect threshold levels, see datasheet for values */ |
| 40 | unsigned int jd_scthr:2; | 40 | unsigned int jd_scthr:2; |
| 41 | unsigned int jd_thr:2; | 41 | unsigned int jd_thr:2; |
| 42 | }; | 42 | }; |