diff options
| author | Patrick McHardy <kaber@trash.net> | 2011-04-13 07:32:28 -0400 |
|---|---|---|
| committer | Patrick McHardy <kaber@trash.net> | 2011-04-13 07:32:28 -0400 |
| commit | b32e3dc7860d00124fa432dba09667e647cb9bcc (patch) | |
| tree | 2fa6e56f389431dfb84609d3d7572cad76e88e71 /include/linux/i2c/twl.h | |
| parent | 6604271c5bc658a6067ed0c3deba4d89e0e50382 (diff) | |
| parent | 96120d86fe302c006259baee9061eea9e1b9e486 (diff) | |
Merge branch 'master' of ssh://master.kernel.org/pub/scm/linux/kernel/git/kaber/nf-2.6
Diffstat (limited to 'include/linux/i2c/twl.h')
| -rw-r--r-- | include/linux/i2c/twl.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/include/linux/i2c/twl.h b/include/linux/i2c/twl.h index 58afd9d2c438..0c0d1ae79981 100644 --- a/include/linux/i2c/twl.h +++ b/include/linux/i2c/twl.h | |||
| @@ -698,6 +698,7 @@ struct twl4030_platform_data { | |||
| 698 | struct regulator_init_data *vana; | 698 | struct regulator_init_data *vana; |
| 699 | struct regulator_init_data *vcxio; | 699 | struct regulator_init_data *vcxio; |
| 700 | struct regulator_init_data *vusb; | 700 | struct regulator_init_data *vusb; |
| 701 | struct regulator_init_data *clk32kg; | ||
| 701 | }; | 702 | }; |
| 702 | 703 | ||
| 703 | /*----------------------------------------------------------------------*/ | 704 | /*----------------------------------------------------------------------*/ |
| @@ -777,5 +778,6 @@ static inline int twl4030charger_usb_en(int enable) { return 0; } | |||
| 777 | 778 | ||
| 778 | /* INTERNAL LDOs */ | 779 | /* INTERNAL LDOs */ |
| 779 | #define TWL6030_REG_VRTC 47 | 780 | #define TWL6030_REG_VRTC 47 |
| 781 | #define TWL6030_REG_CLK32KG 48 | ||
| 780 | 782 | ||
| 781 | #endif /* End of __TWL4030_H */ | 783 | #endif /* End of __TWL4030_H */ |