Merge branch 'master' into tk71

[mv-sheeva.git] / arch / arm / mach-s5pv310 / setup-i2c2.c

diff --git a/arch/arm/mach-s5pv310/setup-i2c2.c b/arch/arm/mach-s5pv310/setup-i2c2.c
index 4c0d8def660ae80c31dc29689c9cbdca5ab9bc18..4163b1233dafbef696f95861e6c31b6588dd9481 100644 (file)
--- a/arch/arm/mach-s5pv310/setup-i2c2.c
+++ b/arch/arm/mach-s5pv310/setup-i2c2.c
@@ -18,8 +18,6 @@ struct platform_device; /* don't need the contents */
 
 void s3c_i2c2_cfg_gpio(struct platform_device *dev)
 {
-       s3c_gpio_cfgpin(S5PV310_GPA0(6), S3C_GPIO_SFN(3));
-       s3c_gpio_setpull(S5PV310_GPA0(6), S3C_GPIO_PULL_UP);
-       s3c_gpio_cfgpin(S5PV310_GPA0(7), S3C_GPIO_SFN(3));
-       s3c_gpio_setpull(S5PV310_GPA0(7), S3C_GPIO_PULL_UP);
+       s3c_gpio_cfgall_range(S5PV310_GPA0(6), 2,
+                             S3C_GPIO_SFN(3), S3C_GPIO_PULL_UP);
 }