summaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2009-12-02 15:41:49 -0800
committerLinus Torvalds <torvalds@linux-foundation.org>2009-12-02 15:41:49 -0800
commit56f3f55cf9b604b924353ab6fcdac5fee5637ae3 (patch)
treeb031bd5d9833a27cec1c551e487810cc2bcb33c8 /include
parent049e2d13b8e8a6d8be43e675a5ed9d4613819f65 (diff)
parent7716977b6ae5a0cdd0afab5c6035c4d0ce53f599 (diff)
downloadlinux-3.10-56f3f55cf9b604b924353ab6fcdac5fee5637ae3.tar.gz
linux-3.10-56f3f55cf9b604b924353ab6fcdac5fee5637ae3.tar.bz2
linux-3.10-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 'include')
-rw-r--r--include/linux/mfd/wm831x/regulator.h4
1 files changed, 2 insertions, 2 deletions
diff --git a/include/linux/mfd/wm831x/regulator.h b/include/linux/mfd/wm831x/regulator.h
index f95466343fb..955d30fc6a2 100644
--- a/include/linux/mfd/wm831x/regulator.h
+++ b/include/linux/mfd/wm831x/regulator.h
@@ -1212,7 +1212,7 @@
#define WM831X_LDO1_OK_SHIFT 0 /* LDO1_OK */
#define WM831X_LDO1_OK_WIDTH 1 /* LDO1_OK */
-#define WM831X_ISINK_MAX_ISEL 56
-extern int wm831x_isinkv_values[WM831X_ISINK_MAX_ISEL];
+#define WM831X_ISINK_MAX_ISEL 55
+extern int wm831x_isinkv_values[WM831X_ISINK_MAX_ISEL + 1];
#endif