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 /include | |
| 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 'include')
| -rw-r--r-- | include/linux/mfd/wm831x/regulator.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/include/linux/mfd/wm831x/regulator.h b/include/linux/mfd/wm831x/regulator.h index f95466343fb2..955d30fc6a27 100644 --- a/include/linux/mfd/wm831x/regulator.h +++ b/include/linux/mfd/wm831x/regulator.h | |||
| @@ -1212,7 +1212,7 @@ | |||
| 1212 | #define WM831X_LDO1_OK_SHIFT 0 /* LDO1_OK */ | 1212 | #define WM831X_LDO1_OK_SHIFT 0 /* LDO1_OK */ |
| 1213 | #define WM831X_LDO1_OK_WIDTH 1 /* LDO1_OK */ | 1213 | #define WM831X_LDO1_OK_WIDTH 1 /* LDO1_OK */ |
| 1214 | 1214 | ||
| 1215 | #define WM831X_ISINK_MAX_ISEL 56 | 1215 | #define WM831X_ISINK_MAX_ISEL 55 |
| 1216 | extern int wm831x_isinkv_values[WM831X_ISINK_MAX_ISEL]; | 1216 | extern int wm831x_isinkv_values[WM831X_ISINK_MAX_ISEL + 1]; |
| 1217 | 1217 | ||
| 1218 | #endif | 1218 | #endif |