---

yaml --- r: 21007 b: refs/heads/master c: dcc8fa5 h: refs/heads/master i: 21005: c0a41ce 21003: b2432f9 20999: 677082a 20991: d2687a6 v: v3
git-mirror · Mar 8, 2006 · 17f8c3f · 17f8c3f
1 parent 5753c55
commit 17f8c3f
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 1 deletion.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 3c8fdae78cf5d73c6739912a1ff087c0f23b2a47
+refs/heads/master: dcc8fa50ebc251a1394a2c8561eee7d79cc5f437
diff --git a/trunk/arch/arm/mach-ixp4xx/nas100d-setup.c b/trunk/arch/arm/mach-ixp4xx/nas100d-setup.c
@@ -113,6 +113,9 @@ static void __init nas100d_init(void)
 {
 	ixp4xx_sys_init();
 
+	/* gpio 14 and 15 are _not_ clocks */
+	*IXP4XX_GPIO_GPCLKR = 0;
+
 	nas100d_flash_resource.start = IXP4XX_EXP_BUS_BASE(0);
 	nas100d_flash_resource.end =
 		IXP4XX_EXP_BUS_BASE(0) + ixp4xx_exp_bus_size - 1;