diff options
| author | merge <null@invalid> | 2009-01-22 13:55:32 +0000 |
|---|---|---|
| committer | Andy Green <agreen@octopus.localdomain> | 2009-01-22 13:55:32 +0000 |
| commit | aa6f5ffbdba45aa8e19e5048648fc6c7b25376d3 (patch) | |
| tree | fbb786d0ac6f8a774fd834e9ce951197e60fbffa /drivers/misc/neo1973_pm_host.c | |
| parent | f2d78193eae5dccd3d588d2c8ea0866efc368332 (diff) | |
MERGE-via-pending-tracking-hist-MERGE-via-stable-tracking-MERGE-via-mokopatches-tracking-fix-stray-endmenu-patch-1232632040-1232632141
pending-tracking-hist top was MERGE-via-stable-tracking-MERGE-via-mokopatches-tracking-fix-stray-endmenu-patch-1232632040-1232632141 / fdf777a63bcb59e0dfd78bfe2c6242e01f6d4eb9 ... parent commitmessage:
From: merge <null@invalid>
MERGE-via-stable-tracking-hist-MERGE-via-mokopatches-tracking-fix-stray-endmenu-patch-1232632040
stable-tracking-hist top was MERGE-via-mokopatches-tracking-fix-stray-endmenu-patch-1232632040 / 90463bfd2d5a3c8b52f6e6d71024a00e052b0ced ... parent commitmessage:
From: merge <null@invalid>
MERGE-via-mokopatches-tracking-hist-fix-stray-endmenu-patch
mokopatches-tracking-hist top was fix-stray-endmenu-patch / 3630e0be570de8057e7f8d2fe501ed353cdf34e6 ... parent commitmessage:
From: Andy Green <andy@openmoko.com>
fix-stray-endmenu.patch
Signed-off-by: Andy Green <andy@openmoko.com>
Diffstat (limited to 'drivers/misc/neo1973_pm_host.c')
| -rw-r--r-- | drivers/misc/neo1973_pm_host.c | 14 |
1 files changed, 3 insertions, 11 deletions
diff --git a/drivers/misc/neo1973_pm_host.c b/drivers/misc/neo1973_pm_host.c index bc2a82c3b6d..bb25acdb7d2 100644 --- a/drivers/misc/neo1973_pm_host.c +++ b/drivers/misc/neo1973_pm_host.c @@ -21,29 +21,21 @@ #ifdef CONFIG_MACH_NEO1973_GTA02 #include <mach/gta02.h> -#include <linux/mfd/pcf50633/gpio.h> +#include <linux/pcf50633.h> static ssize_t pm_host_read(struct device *dev, struct device_attribute *attr, char *buf) { return sprintf(buf, "%d\n", - pcf50633_gpio_get(gta02_pcf_pdata.pcf, PCF50633_GPO) - == PCF50633_GPOCFG_GPOSEL_1); + pcf50633_gpio_get(pcf50633_global, PCF50633_GPO)); } static ssize_t pm_host_write(struct device *dev, struct device_attribute *attr, const char *buf, size_t count) { unsigned long on = simple_strtoul(buf, NULL, 10); - u8 val; - if (on) - val = PCF50633_GPOCFG_GPOSEL_1; - else - val = PCF50633_GPOCFG_GPOSEL_0; - - - pcf50633_gpio_set(gta02_pcf_pdata.pcf, PCF50633_GPO, val); + pcf50633_gpio_set(pcf50633_global, PCF50633_GPO, on); return count; } |