diff options
| author | Balaji Rao <balaji@raobalaji.com> | 2009-01-28 19:24:51 +0000 |
|---|---|---|
| committer | Andy Green <agreen@octopus.localdomain> | 2009-01-28 19:24:51 +0000 |
| commit | 11afa2f75c68eb2c984ea43a92b8e453b8b70e49 (patch) | |
| tree | e5ddcd1de8861c843e2d82edc6e0ef1d023550b5 | |
| parent | 1537f2fae4eb0ca0c3d516dfe121f5eda71e0c2c (diff) | |
From: Balaji Rao <balaji@openmoko.org>
clean-29-rc2-merge-freakage.patch
| -rw-r--r-- | arch/arm/plat-s3c24xx/neo1973_pm_gps.c | 2 | ||||
| -rw-r--r-- | include/linux/mfd/pcf50633/mbc.h | 10 |
2 files changed, 0 insertions, 12 deletions
diff --git a/arch/arm/plat-s3c24xx/neo1973_pm_gps.c b/arch/arm/plat-s3c24xx/neo1973_pm_gps.c index 84785dfa52a..6367232f3a6 100644 --- a/arch/arm/plat-s3c24xx/neo1973_pm_gps.c +++ b/arch/arm/plat-s3c24xx/neo1973_pm_gps.c @@ -52,8 +52,6 @@ enum gta01_pm_gps_supplies { GTA01_GPS_NUM_REG }; -#include <linux/err.h> - struct neo1973_pm_gps_data { #ifdef CONFIG_PM int keep_on_in_suspend; diff --git a/include/linux/mfd/pcf50633/mbc.h b/include/linux/mfd/pcf50633/mbc.h index 247c7d12785..86585d67409 100644 --- a/include/linux/mfd/pcf50633/mbc.h +++ b/include/linux/mfd/pcf50633/mbc.h @@ -129,15 +129,5 @@ int pcf50633_mbc_usb_curlim_set(struct pcf50633 *pcf, int ma); int pcf50633_mbc_get_status(struct pcf50633 *); void pcf50633_mbc_set_status(struct pcf50633 *, int what, int status); -#if 0 - struct power_supply ac; - struct power_supply usb; - struct power_supply adapter; - - struct delayed_work charging_restart_work; - - struct platform_device *pdev; -}; -#endif #endif |