diff options
| author | Christoph Egger <siccegge@stud.informatik.uni-erlangen.de> | 2010-01-15 09:33:46 -0500 |
|---|---|---|
| committer | Samuel Ortiz <sameo@linux.intel.com> | 2010-03-07 16:17:11 -0500 |
| commit | f7ea2dc59ed46dcd0f1cfaccda02211f4507207b (patch) | |
| tree | a8afa0e127faa17233800a66d80cb03d41e5bd18 /include/linux/i2c | |
| parent | ca229f1b624a72a1c9eb1d94bbca7a0c094a1b8b (diff) | |
mfd: Remove leftover from discontinued TWL4030 battery patch
The TWL4030_BCI_BATTERY config option originates from a patch to the
omap git tree. However inclusion in linux was seemingly rejected and
the functionality nears inclusion under a different name so this
removes the bits of the old version that made it into the mainline
kernel again.
Signed-off-by: Christoph Egger <siccegge@stud.informatik.uni-erlangen.de>
Signed-off-by: Samuel Ortiz <sameo@linux.intel.com>
Diffstat (limited to 'include/linux/i2c')
| -rw-r--r-- | include/linux/i2c/twl.h | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/include/linux/i2c/twl.h b/include/linux/i2c/twl.h index 7897f3096560..9733e9e53f2b 100644 --- a/include/linux/i2c/twl.h +++ b/include/linux/i2c/twl.h | |||
| @@ -605,12 +605,7 @@ int twl4030_sih_setup(int module); | |||
| 605 | #define TWL4030_VAUX3_DEV_GRP 0x1F | 605 | #define TWL4030_VAUX3_DEV_GRP 0x1F |
| 606 | #define TWL4030_VAUX3_DEDICATED 0x22 | 606 | #define TWL4030_VAUX3_DEDICATED 0x22 |
| 607 | 607 | ||
| 608 | #if defined(CONFIG_TWL4030_BCI_BATTERY) || \ | 608 | static inline int twl4030charger_usb_en(int enable) { return 0; } |
| 609 | defined(CONFIG_TWL4030_BCI_BATTERY_MODULE) | ||
| 610 | extern int twl4030charger_usb_en(int enable); | ||
| 611 | #else | ||
| 612 | static inline int twl4030charger_usb_en(int enable) { return 0; } | ||
| 613 | #endif | ||
| 614 | 609 | ||
| 615 | /*----------------------------------------------------------------------*/ | 610 | /*----------------------------------------------------------------------*/ |
| 616 | 611 | ||
