Merge commit 'v2.6.32' into next

This commit is contained in:
Dmitry Torokhov 2009-12-02 23:38:13 -08:00
commit 467832032c
799 changed files with 13337 additions and 6177 deletions

View file

@ -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,