diff options
| author | merging other branches <null@invalid> | 2008-11-26 16:07:01 +0000 |
|---|---|---|
| committer | Andy Green <agreen@pads.home.warmcat.com> | 2008-11-26 16:07:01 +0000 |
| commit | 6d2c293d6578048e7b71e0c44897144f15f350ae (patch) | |
| tree | cba36be2a06ee7bfa0aab1a3c7d36bd67ea37402 /drivers/power | |
| parent | 524f4a1dfe71a8b353a244140164e09828abb68c (diff) | |
MERGE-via-balaji-tracking-hist-MERGE-via-stable-tracking-hist-MERGE-via-mokopatches-tracking-via-master-s3c-hsmmc-clean
balaji-tracking-hist top was efb2d57c0e0ed62324d79d6c5793fe797c157266
Diffstat (limited to 'drivers/power')
| -rw-r--r-- | drivers/power/pcf50633-charger.c | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/drivers/power/pcf50633-charger.c b/drivers/power/pcf50633-charger.c index 24d6a8aa7e5..03d64111501 100644 --- a/drivers/power/pcf50633-charger.c +++ b/drivers/power/pcf50633-charger.c @@ -5,7 +5,7 @@ * All rights reserved. * * Broken down from monstrous PCF50633 driver mainly by - * Harald Welte and Andy Green + * Harald Welte, Andy Green and Werner Almesberger * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License as @@ -49,7 +49,7 @@ void pcf50633_mbc_usb_curlim_set(struct pcf50633 *pcf, int ma) power_supply_changed(&pcf->mbc.usb); } -EXPORT_SYMBOL(pcf50633_mbc_usb_curlim_set); +EXPORT_SYMBOL_GPL(pcf50633_mbc_usb_curlim_set); static const char *chgmode_names[] = { [PCF50633_MBCS2_MBC_PLAY] = "play-only", @@ -130,7 +130,7 @@ static void pcf50633_mbc_irq_handler(struct pcf50633 *pcf, int irq, void *data) struct pcf50633_mbc *mbc; mbc = &pcf->mbc; - + /* USB */ if (irq == PCF50633_IRQ_USBINS) mbc->usb_online = 1; @@ -298,4 +298,3 @@ MODULE_AUTHOR("Balaji Rao <balajirrao@openmoko.org>"); MODULE_DESCRIPTION("PCF50633 mbc driver"); MODULE_LICENSE("GPL"); MODULE_ALIAS("platform:pcf50633-mbc"); - |