---

yaml --- r: 191932 b: refs/heads/master c: fb37874 h: refs/heads/master v: v3
git-mirror · May 6, 2010 · 42ecc42 · 42ecc42
1 parent cc93f23
commit 42ecc42
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 3 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 64f508da584f983642eb8cf808fcca68f9efa44a
+refs/heads/master: fb3787470ee6fee5900026170c05261c8c090a06
diff --git a/trunk/arch/arm/mach-s3c2410/mach-amlm5900.c b/trunk/arch/arm/mach-s3c2410/mach-amlm5900.c
@@ -227,7 +227,7 @@ static void amlm5900_init_pm(void)
 		enable_irq_wake(IRQ_EINT9);
 		/* configure the suspend/resume status pin */
 		s3c_gpio_cfgpin(S3C2410_GPF(2), S3C2410_GPIO_OUTPUT);
-		s3c2410_gpio_pullup(S3C2410_GPF(2), 0);
+		s3c_gpio_setpull(S3C2410_GPF(2), S3C_GPIO_PULL_UP);
 	}
 }
 static void __init amlm5900_init(void)

diff --git a/trunk/arch/arm/mach-s3c2410/mach-h1940.c b/trunk/arch/arm/mach-s3c2410/mach-h1940.c
@@ -209,7 +209,7 @@ static int h1940_backlight_init(struct device *dev)
 	gpio_request(S3C2410_GPB(0), "Backlight");
 
 	gpio_direction_output(S3C2410_GPB(0), 0);
-	s3c2410_gpio_pullup(S3C2410_GPB(0), 0);
+	s3c_gpio_setpull(S3C2410_GPB(0), S3C_GPIO_PULL_NONE);
 	s3c_gpio_cfgpin(S3C2410_GPB(0), S3C2410_GPB0_TOUT0);
 
 	return 0;