diff options
| author | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2009-06-15 10:36:54 +1000 |
|---|---|---|
| committer | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2009-06-15 10:36:54 +1000 |
| commit | 7dafd239ab522d38979ebe44d79aa68ad7b1a383 (patch) | |
| tree | 04754a0c6495e57c1fe5f417fbfc99272d353c0e /arch/arm/mach-s3c2410/mach-amlm5900.c | |
| parent | bc47ab0241c7c86da4f5e5f82fbca7d45387c18d (diff) | |
| parent | 45e3e1935e2857c54783291107d33323b3ef33c8 (diff) | |
Merge commit 'origin/master' into next
Diffstat (limited to 'arch/arm/mach-s3c2410/mach-amlm5900.c')
| -rw-r--r-- | arch/arm/mach-s3c2410/mach-amlm5900.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/arch/arm/mach-s3c2410/mach-amlm5900.c b/arch/arm/mach-s3c2410/mach-amlm5900.c index 6d6995afeb4..06a84adfb13 100644 --- a/arch/arm/mach-s3c2410/mach-amlm5900.c +++ b/arch/arm/mach-s3c2410/mach-amlm5900.c @@ -32,6 +32,7 @@ #include <linux/list.h> #include <linux/timer.h> #include <linux/init.h> +#include <linux/gpio.h> #include <linux/device.h> #include <linux/platform_device.h> #include <linux/proc_fs.h> @@ -224,8 +225,8 @@ static void amlm5900_init_pm(void) } else { enable_irq_wake(IRQ_EINT9); /* configure the suspend/resume status pin */ - s3c2410_gpio_cfgpin(S3C2410_GPF2, S3C2410_GPF2_OUTP); - s3c2410_gpio_pullup(S3C2410_GPF2, 0); + s3c2410_gpio_cfgpin(S3C2410_GPF(2), S3C2410_GPIO_OUTPUT); + s3c2410_gpio_pullup(S3C2410_GPF(2), 0); } } static void __init amlm5900_init(void) |