From 5e77b37de12d7f9d94b4afb46b30f633de5bdaa6 Mon Sep 17 00:00:00 2001
From: "Robert P. J. Day" <rpjday@crashcourse.ca>
Date: Sun, 16 Mar 2008 04:27:07 +1100
Subject: [PATCH] --- yaml --- r: 91510 b: refs/heads/master c:
 c5d5d94aa54ba1f7691b79336b18804d4b0adf48 h: refs/heads/master v: v3

---
 [refs]                                | 2 +-
 trunk/arch/ppc/syslib/mpc52xx_setup.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index f91edbc12b85..41f08deb1b48 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 221ac329e93fe2a676346af2e98e311251648f69
+refs/heads/master: c5d5d94aa54ba1f7691b79336b18804d4b0adf48
diff --git a/trunk/arch/ppc/syslib/mpc52xx_setup.c b/trunk/arch/ppc/syslib/mpc52xx_setup.c
index 9f504fc7693e..ab0cf4ced9e5 100644
--- a/trunk/arch/ppc/syslib/mpc52xx_setup.c
+++ b/trunk/arch/ppc/syslib/mpc52xx_setup.c
@@ -279,7 +279,7 @@ int mpc52xx_match_psc_function(int psc_idx, const char *func)
 
 int mpc52xx_set_psc_clkdiv(int psc_id, int clkdiv)
 {
-	static spinlock_t lock = SPIN_LOCK_UNLOCKED;
+	static DEFINE_SPINLOCK(lock);
 	struct mpc52xx_cdm __iomem *cdm;
 	unsigned long flags;
 	u16 mclken_div;