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

mfd: Remove leftover from discontinued TWL4030 battery patch

Browse Source 
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>
This commit is contained in:
Christoph Egger
2010-01-15 15:33:46 +01:00
committed by Samuel Ortiz
parent ca229f1b62
commit f7ea2dc59e
2 changed files with 1 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
include/linux/i2c/twl.h
View File

@@ -605,12 +605,7 @@ int twl4030_sih_setup(int module);
#define TWL4030_VAUX3_DEV_GRP 0x1F
#define TWL4030_VAUX3_DEDICATED 0x22
#if defined(CONFIG_TWL4030_BCI_BATTERY) || \
defined(CONFIG_TWL4030_BCI_BATTERY_MODULE)
extern int twl4030charger_usb_en(int enable);
#else
static inline int twl4030charger_usb_en(int enable) { return 0; }
#endif
static inline int twl4030charger_usb_en(int enable) { return 0; }
/*----------------------------------------------------------------------*/