ARM: S3C24XX: Drop s3c2410 specific s3c2410_gpio_cfgpin()

[deliverable/linux.git] / arch / arm / mach-s3c2410 / mach-amlm5900.c

diff --git a/arch/arm/mach-s3c2410/mach-amlm5900.c b/arch/arm/mach-s3c2410/mach-amlm5900.c
index 06a84adfb13fedf936c73e8297ad34715d3df02b..b42a76042af537a1e2765c4afc53bcde859c6140 100644 (file)
--- a/arch/arm/mach-s3c2410/mach-amlm5900.c
+++ b/arch/arm/mach-s3c2410/mach-amlm5900.c
@@ -56,6 +56,7 @@
 #include <plat/iic.h>
 #include <plat/devs.h>
 #include <plat/cpu.h>
+#include <plat/gpio-cfg.h>
 
 #ifdef CONFIG_MTD_PARTITIONS
 
@@ -153,7 +154,7 @@ static struct platform_device *amlm5900_devices[] __initdata = {
        &s3c_device_adc,
        &s3c_device_wdt,
        &s3c_device_i2c0,
-       &s3c_device_usb,
+       &s3c_device_ohci,
        &s3c_device_rtc,
        &s3c_device_usbgadget,
         &s3c_device_sdi,
@@ -225,7 +226,7 @@ static void amlm5900_init_pm(void)
        } else {
                enable_irq_wake(IRQ_EINT9);
                /* configure the suspend/resume status pin */
-               s3c2410_gpio_cfgpin(S3C2410_GPF(2), S3C2410_GPIO_OUTPUT);
+               s3c_gpio_cfgpin(S3C2410_GPF(2), S3C2410_GPIO_OUTPUT);
                s3c2410_gpio_pullup(S3C2410_GPF(2), 0);
        }
 }