diff options
| author | Grant Likely <grant.likely@secretlab.ca> | 2012-03-12 11:41:28 -0400 |
|---|---|---|
| committer | Grant Likely <grant.likely@secretlab.ca> | 2012-03-12 11:41:28 -0400 |
| commit | e2aa4177264c1a459779d6e35fae22adf17a9232 (patch) | |
| tree | beba4b40aa90f6f033eb261cf5a5453c5957c87c /drivers/mfd/wm8994-regmap.c | |
| parent | 25db711df3258d125dc1209800317e5c0ef3c870 (diff) | |
| parent | fde7d9049e55ab85a390be7f415d74c9f62dd0f9 (diff) | |
Merge tag 'v3.3-rc7' into gpio/next
Linux 3.3-rc7. Merged into the gpio branch to pick up gpio bugfixes already
in mainline before queueing up move v3.4 patches
Diffstat (limited to 'drivers/mfd/wm8994-regmap.c')
| -rw-r--r-- | drivers/mfd/wm8994-regmap.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/mfd/wm8994-regmap.c b/drivers/mfd/wm8994-regmap.c index c598ae69b8ff..bc0c5096539a 100644 --- a/drivers/mfd/wm8994-regmap.c +++ b/drivers/mfd/wm8994-regmap.c | |||
| @@ -806,6 +806,7 @@ static bool wm1811_readable_register(struct device *dev, unsigned int reg) | |||
| 806 | case WM8994_DC_SERVO_2: | 806 | case WM8994_DC_SERVO_2: |
| 807 | case WM8994_DC_SERVO_READBACK: | 807 | case WM8994_DC_SERVO_READBACK: |
| 808 | case WM8994_DC_SERVO_4: | 808 | case WM8994_DC_SERVO_4: |
| 809 | case WM8994_DC_SERVO_4E: | ||
| 809 | case WM8994_ANALOGUE_HP_1: | 810 | case WM8994_ANALOGUE_HP_1: |
| 810 | case WM8958_MIC_DETECT_1: | 811 | case WM8958_MIC_DETECT_1: |
| 811 | case WM8958_MIC_DETECT_2: | 812 | case WM8958_MIC_DETECT_2: |