Merge branch 'next-s5p64x0' into for-next-new

[mv-sheeva.git] / arch / arm / mach-s5pc100 / setup-ide.c

diff --git a/arch/arm/mach-s5pc100/setup-ide.c b/arch/arm/mach-s5pc100/setup-ide.c
index d8b0d0eac139b6211feea327374589ee8b209247..223aae044466f59f46d8d9aa614c3b07e51a80a8 100644 (file)
--- a/arch/arm/mach-s5pc100/setup-ide.c
+++ b/arch/arm/mach-s5pc100/setup-ide.c
@@ -19,7 +19,7 @@
 
 static void s5pc100_ide_cfg_gpios(unsigned int base, unsigned int nr)
 {
-       s3c_gpio_cfgall_range(base, nr, S3C_GPIO_SFN(4), S3C_GPIO_PULL_NONE);
+       s3c_gpio_cfgrange_nopull(base, nr, S3C_GPIO_SFN(4));
 
        for (; nr > 0; nr--, base++)
                s5p_gpio_set_drvstr(base, S5P_GPIO_DRVSTR_LV4);
@@ -49,8 +49,7 @@ void s5pc100_ide_setup_gpio(void)
        s3c_gpio_cfgpin_range(S5PC100_GPK0(6), 2, S3C_GPIO_SFN(0));
 
        /* CF_OE, CF_WE */
-       s3c_gpio_cfgall_range(S5PC100_GPK1(6), 8,
-                             S3C_GPIO_SFN(2), S3C_GPIO_PULL_NONE);
+       s3c_gpio_cfgrange_nopull(S5PC100_GPK1(6), 8, S3C_GPIO_SFN(2));
 
        /* CF_CD */
        s3c_gpio_cfgpin(S5PC100_GPK3(5), S3C_GPIO_SFN(2));