diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2009-12-02 18:41:49 -0500 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-12-02 18:41:49 -0500 |
| commit | 56f3f55cf9b604b924353ab6fcdac5fee5637ae3 (patch) | |
| tree | b031bd5d9833a27cec1c551e487810cc2bcb33c8 /drivers | |
| parent | 049e2d13b8e8a6d8be43e675a5ed9d4613819f65 (diff) | |
| parent | 7716977b6ae5a0cdd0afab5c6035c4d0ce53f599 (diff) | |
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/sameo/mfd-2.6
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/sameo/mfd-2.6:
mfd: Correct WM831X_MAX_ISEL_VALUE
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/mfd/wm831x-core.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/mfd/wm831x-core.c b/drivers/mfd/wm831x-core.c index 49b7885c2702..7f27576ca046 100644 --- a/drivers/mfd/wm831x-core.c +++ b/drivers/mfd/wm831x-core.c | |||
| @@ -29,7 +29,7 @@ | |||
| 29 | /* Current settings - values are 2*2^(reg_val/4) microamps. These are | 29 | /* Current settings - values are 2*2^(reg_val/4) microamps. These are |
| 30 | * exported since they are used by multiple drivers. | 30 | * exported since they are used by multiple drivers. |
| 31 | */ | 31 | */ |
| 32 | int wm831x_isinkv_values[WM831X_ISINK_MAX_ISEL] = { | 32 | int wm831x_isinkv_values[WM831X_ISINK_MAX_ISEL + 1] = { |
| 33 | 2, | 33 | 2, |
| 34 | 2, | 34 | 2, |
| 35 | 3, | 35 | 3, |