diff options
| author | Balaji Rao <balajirrao@openmoko.org> | 2008-11-20 19:46:51 +0000 |
|---|---|---|
| committer | Andy Green <agreen@pads.home.warmcat.com> | 2008-11-20 19:46:51 +0000 |
| commit | ad1e78fb2babc9cf9acd62923d62389ea28b1df2 (patch) | |
| tree | dd37e7a75e654d38e601342cacd57a6b30cded8c /arch/arm/plat-s3c24xx | |
| parent | 5557b3223d35dd25366d6ef047299b1dc94b17e6 (diff) | |
pcf50633_mdc_related_changes.patch
Changes related to pcf50633_mfd.patch
Diffstat (limited to 'arch/arm/plat-s3c24xx')
| -rw-r--r-- | arch/arm/plat-s3c24xx/neo1973_pm_bt.c | 1 | ||||
| -rw-r--r-- | arch/arm/plat-s3c24xx/neo1973_pm_gps.c | 1 | ||||
| -rw-r--r-- | arch/arm/plat-s3c24xx/neo1973_pm_gsm.c | 2 | ||||
| -rw-r--r-- | arch/arm/plat-s3c24xx/neo1973_pm_host.c | 2 | ||||
| -rw-r--r-- | arch/arm/plat-s3c24xx/neo1973_pm_resume_reason.c | 6 |
5 files changed, 5 insertions, 7 deletions
diff --git a/arch/arm/plat-s3c24xx/neo1973_pm_bt.c b/arch/arm/plat-s3c24xx/neo1973_pm_bt.c index 1e3d9698e78..d3a046cada1 100644 --- a/arch/arm/plat-s3c24xx/neo1973_pm_bt.c +++ b/arch/arm/plat-s3c24xx/neo1973_pm_bt.c @@ -27,7 +27,6 @@ /* For GTA02 */ #include <mach/gta02.h> -#include <linux/pcf50633.h> #include <linux/regulator/consumer.h> diff --git a/arch/arm/plat-s3c24xx/neo1973_pm_gps.c b/arch/arm/plat-s3c24xx/neo1973_pm_gps.c index 1715769cbb1..89075693b9f 100644 --- a/arch/arm/plat-s3c24xx/neo1973_pm_gps.c +++ b/arch/arm/plat-s3c24xx/neo1973_pm_gps.c @@ -29,7 +29,6 @@ /* For GTA02 */ #include <mach/gta02.h> -#include <linux/pcf50633.h> #include <linux/regulator/consumer.h> diff --git a/arch/arm/plat-s3c24xx/neo1973_pm_gsm.c b/arch/arm/plat-s3c24xx/neo1973_pm_gsm.c index ebed33558a7..46c99c9042f 100644 --- a/arch/arm/plat-s3c24xx/neo1973_pm_gsm.c +++ b/arch/arm/plat-s3c24xx/neo1973_pm_gsm.c @@ -29,7 +29,7 @@ /* For GTA02 */ #include <mach/gta02.h> -#include <linux/pcf50633.h> +#include <linux/mfd/pcf50633/gpio.h> #include <mach/regs-gpio.h> #include <mach/regs-gpioj.h> diff --git a/arch/arm/plat-s3c24xx/neo1973_pm_host.c b/arch/arm/plat-s3c24xx/neo1973_pm_host.c index 8ab589b3ad8..caa302eeb91 100644 --- a/arch/arm/plat-s3c24xx/neo1973_pm_host.c +++ b/arch/arm/plat-s3c24xx/neo1973_pm_host.c @@ -21,7 +21,7 @@ #ifdef CONFIG_MACH_NEO1973_GTA02 #include <mach/gta02.h> -#include <linux/pcf50633.h> +#include <linux/mfd/pcf50633/core.h> static ssize_t pm_host_read(struct device *dev, struct device_attribute *attr, char *buf) diff --git a/arch/arm/plat-s3c24xx/neo1973_pm_resume_reason.c b/arch/arm/plat-s3c24xx/neo1973_pm_resume_reason.c index a04466c8960..62984a50a0a 100644 --- a/arch/arm/plat-s3c24xx/neo1973_pm_resume_reason.c +++ b/arch/arm/plat-s3c24xx/neo1973_pm_resume_reason.c @@ -22,7 +22,7 @@ #ifdef CONFIG_MACH_NEO1973_GTA02 #include <mach/gta02.h> -#include <linux/pcf50633.h> +#include <linux/mfd/pcf50633/core.h> #endif static unsigned int *gstatus4_mapped; @@ -79,8 +79,8 @@ static ssize_t resume_reason_read(struct device *dev, end += sprintf(end, " %s\n", resume_reasons[gta][bit]); #ifdef CONFIG_MACH_NEO1973_GTA02 - if ((gta) && (bit == 9)) /* PMU */ - end += pcf50633_report_resumers(gta02_pcf_pdata.pcf, end); + if ((gta) && (bit == 9)); /* PMU */ +// end += pcf50633_report_resumers(gta02_pcf_pdata.pcf, end); #endif } |