diff options
| author | Lars-Peter Clausen <lars@metafoo.de> | 2009-10-23 22:09:53 +0200 |
|---|---|---|
| committer | Lars-Peter Clausen <lars@metafoo.de> | 2009-10-23 22:09:53 +0200 |
| commit | 8123f88b8de62ce957c0a1e8a68060ceee685a36 (patch) | |
| tree | 9ef2f3b3784761999aa27a2494eda8c6cdeee561 /include/linux/mfd/pcf50606/mbc.h | |
| parent | ee6baee93c67d4022c756642725e9985fbfd8332 (diff) | |
| parent | 4eeac57dd1e056aedbe9d98756d9e5cd211c311b (diff) | |
Merge branch 'pcf50606-2.6.31' into om-gta01-2.6.31
Diffstat (limited to 'include/linux/mfd/pcf50606/mbc.h')
| -rw-r--r-- | include/linux/mfd/pcf50606/mbc.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/linux/mfd/pcf50606/mbc.h b/include/linux/mfd/pcf50606/mbc.h index b793d703a64..23aeb9e3138 100644 --- a/include/linux/mfd/pcf50606/mbc.h +++ b/include/linux/mfd/pcf50606/mbc.h @@ -46,7 +46,7 @@ #define PCF50606_MBC_CHARGER_ONLINE 0x01 #define PCF50606_MBC_CHARGER_ACTIVE 0x02 -void pcf50606_charge_fast(struct pcf50606 *pcf, int on); +int pcf50606_charge_fast(struct pcf50606 *pcf, int on); #endif |