lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/sameo/mfd-2.6

Browse Source 
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/sameo/mfd-2.6:
  mfd: Correct WM831X_MAX_ISEL_VALUE
This commit is contained in:
Linus Torvalds
2009-12-02 15:41:49 -08:00
parent 049e2d13b8 7716977b6a
commit 56f3f55cf9
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
drivers/mfd/wm831x-core.c
View File

@@ -29,7 +29,7 @@
/* Current settings - values are 2*2^(reg_val/4) microamps. These are /* Current settings - values are 2*2^(reg_val/4) microamps. These are
* exported since they are used by multiple drivers. * 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,
2, 2,
3, 3,

4
include/linux/mfd/wm831x/regulator.h
View File

@@ -1212,7 +1212,7 @@
#define WM831X_LDO1_OK_SHIFT 0 /* LDO1_OK */ #define WM831X_LDO1_OK_SHIFT 0 /* LDO1_OK */
#define WM831X_LDO1_OK_WIDTH 1 /* LDO1_OK */ #define WM831X_LDO1_OK_WIDTH 1 /* LDO1_OK */
#define WM831X_ISINK_MAX_ISEL 56 #define WM831X_ISINK_MAX_ISEL 55
extern int wm831x_isinkv_values[WM831X_ISINK_MAX_ISEL]; extern int wm831x_isinkv_values[WM831X_ISINK_MAX_ISEL + 1];
#endif #endif