From 17f8c3f75cc0bde0dda59f10fd7ccc42ffb708f0 Mon Sep 17 00:00:00 2001
From: Alessandro Zummo <a.zummo@towertech.it>
Date: Wed, 8 Mar 2006 23:45:10 +0000
Subject: [PATCH] --- yaml --- r: 21007 b: refs/heads/master c:
 dcc8fa50ebc251a1394a2c8561eee7d79cc5f437 h: refs/heads/master i:   21005:
 c0a41ce939da801d2e2e7b1325fbd420a24e2218   21003:
 b2432f95d8a60c776f36d94395ccee06faadfe75   20999:
 677082a516b381b337ca919ef6444c822817c5aa   20991:
 d2687a6199f374786d9e20952407885b26b64d5a v: v3

---
 [refs]                                     | 2 +-
 trunk/arch/arm/mach-ixp4xx/nas100d-setup.c | 3 +++
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index 59cec8691f08..449193f7afe7 100644
--- 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
index 856d56f3b2ae..a3b4c6ac5708 100644
--- 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;