Merge branch 'for-linus' of git://git.infradead.org/users/eparis/notify

[net-next-2.6.git] / arch / arm / mach-s5pv310 / setup-i2c0.c

diff --git a/arch/arm/mach-s5pv310/setup-i2c0.c b/arch/arm/mach-s5pv310/setup-i2c0.c
index 436712807383e43c4cd073b13dbe61ec01be2039..f47f8f3152ecf642ec491c2723a0e0ef9400307a 100644 (file)
--- a/arch/arm/mach-s5pv310/setup-i2c0.c
+++ b/arch/arm/mach-s5pv310/setup-i2c0.c
@@ -21,8 +21,6 @@ struct platform_device; /* don't need the contents */
 
 void s3c_i2c0_cfg_gpio(struct platform_device *dev)
 {
-       s3c_gpio_cfgpin(S5PV310_GPD1(0), S3C_GPIO_SFN(2));
-       s3c_gpio_setpull(S5PV310_GPD1(0), S3C_GPIO_PULL_UP);
-       s3c_gpio_cfgpin(S5PV310_GPD1(1), S3C_GPIO_SFN(2));
-       s3c_gpio_setpull(S5PV310_GPD1(1), S3C_GPIO_PULL_UP);
+       s3c_gpio_cfgall_range(S5PV310_GPD1(0), 2,
+                             S3C_GPIO_SFN(2), S3C_GPIO_PULL_UP);
 }