diff options
| author | Tony Lindgren <tony@atomide.com> | 2011-11-07 15:27:23 -0500 |
|---|---|---|
| committer | Tony Lindgren <tony@atomide.com> | 2011-11-07 15:27:23 -0500 |
| commit | d30cc16c8e48368e0518f4975a78711e53e14a0f (patch) | |
| tree | 26b57f7ab5a963cc3d6c57dff6951bd930875583 /arch/arm/mach-s3c2440/s3c2442.c | |
| parent | 41eb2d813f558900884e240c2f723e36c7bd151f (diff) | |
| parent | a1bcc1dcef8451b4291ea2a1b2677cb194102952 (diff) | |
Merge branch 'fixes-modulesplit' into fixes
Diffstat (limited to 'arch/arm/mach-s3c2440/s3c2442.c')
| -rw-r--r-- | arch/arm/mach-s3c2440/s3c2442.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/arm/mach-s3c2440/s3c2442.c b/arch/arm/mach-s3c2440/s3c2442.c index 6f2b65e6e06..2c822e09392 100644 --- a/arch/arm/mach-s3c2440/s3c2442.c +++ b/arch/arm/mach-s3c2440/s3c2442.c | |||
| @@ -182,6 +182,6 @@ void __init s3c2442_map_io(void) | |||
| 182 | { | 182 | { |
| 183 | s3c244x_map_io(); | 183 | s3c244x_map_io(); |
| 184 | 184 | ||
| 185 | s3c24xx_gpiocfg_default.set_pull = s3c_gpio_setpull_1down; | 185 | s3c24xx_gpiocfg_default.set_pull = s3c24xx_gpio_setpull_1down; |
| 186 | s3c24xx_gpiocfg_default.get_pull = s3c_gpio_getpull_1down; | 186 | s3c24xx_gpiocfg_default.get_pull = s3c24xx_gpio_getpull_1down; |
| 187 | } | 187 | } |