git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'drm-fixes' of git://people.freedesktop.org/~airlied/linux
[pandora-kernel.git]
/
arch
/
arm
/
mach-s3c2440
/
s3c2440.c
diff --git
a/arch/arm/mach-s3c2440/s3c2440.c
b/arch/arm/mach-s3c2440/s3c2440.c
index
2270d33
..
37f8cc6
100644
(file)
--- a/
arch/arm/mach-s3c2440/s3c2440.c
+++ b/
arch/arm/mach-s3c2440/s3c2440.c
@@
-70,6
+70,6
@@
void __init s3c2440_map_io(void)
{
s3c244x_map_io();
{
s3c244x_map_io();
- s3c24xx_gpiocfg_default.set_pull = s3c_gpio_setpull_1up;
- s3c24xx_gpiocfg_default.get_pull = s3c_gpio_getpull_1up;
+ s3c24xx_gpiocfg_default.set_pull = s3c
24xx
_gpio_setpull_1up;
+ s3c24xx_gpiocfg_default.get_pull = s3c
24xx
_gpio_getpull_1up;
}
}