diff options
| author | Russell King <rmk+kernel@arm.linux.org.uk> | 2010-10-28 15:39:13 -0400 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2010-10-28 15:39:13 -0400 |
| commit | 9bafc74163d8bccca9810159aab39be926fb877c (patch) | |
| tree | baa3ba406135247eeb9cdf495448b5db8eea2f0b /arch/arm/mach-s5pv310/setup-i2c2.c | |
| parent | 8df6516864462cb7a6f87d5a46df68fb0faebbb5 (diff) | |
| parent | b3773301c4290f054aa2aa5379e59a1bf4f78bdf (diff) | |
Merge branch 'devel-stable' into devel
Diffstat (limited to 'arch/arm/mach-s5pv310/setup-i2c2.c')
| -rw-r--r-- | arch/arm/mach-s5pv310/setup-i2c2.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/arch/arm/mach-s5pv310/setup-i2c2.c b/arch/arm/mach-s5pv310/setup-i2c2.c index 4c0d8def660a..4163b1233daf 100644 --- 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 */ | |||
| 18 | 18 | ||
| 19 | void s3c_i2c2_cfg_gpio(struct platform_device *dev) | 19 | void s3c_i2c2_cfg_gpio(struct platform_device *dev) |
| 20 | { | 20 | { |
| 21 | s3c_gpio_cfgpin(S5PV310_GPA0(6), S3C_GPIO_SFN(3)); | 21 | s3c_gpio_cfgall_range(S5PV310_GPA0(6), 2, |
| 22 | s3c_gpio_setpull(S5PV310_GPA0(6), S3C_GPIO_PULL_UP); | 22 | S3C_GPIO_SFN(3), S3C_GPIO_PULL_UP); |
| 23 | s3c_gpio_cfgpin(S5PV310_GPA0(7), S3C_GPIO_SFN(3)); | ||
| 24 | s3c_gpio_setpull(S5PV310_GPA0(7), S3C_GPIO_PULL_UP); | ||
| 25 | } | 23 | } |