diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2009-12-03 00:41:49 +0100 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-12-03 00:41:49 +0100 |
| commit | 56f3f55cf9b604b924353ab6fcdac5fee5637ae3 (patch) | |
| tree | b031bd5d9833a27cec1c551e487810cc2bcb33c8 /drivers | |
| parent | Input: i8042 - add Dell Vostro 1320, 1520 and 1720 to the reset list (diff) | |
| parent | mfd: Correct WM831X_MAX_ISEL_VALUE (diff) | |
| download | linux-56f3f55cf9b604b924353ab6fcdac5fee5637ae3.tar.xz linux-56f3f55cf9b604b924353ab6fcdac5fee5637ae3.zip | |
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 @@ /* Current settings - values are 2*2^(reg_val/4) microamps. These are * exported since they are used by multiple drivers. */ -int wm831x_isinkv_values[WM831X_ISINK_MAX_ISEL] = { +int wm831x_isinkv_values[WM831X_ISINK_MAX_ISEL + 1] = { 2, 2, 3, |