Pull video into release branch

[linux-2.6-omap-h63xx.git] / arch / avr32 / mach-at32ap / clock.c

diff --git a/arch/avr32/mach-at32ap/clock.c b/arch/avr32/mach-at32ap/clock.c
index 00c435452d7e500e473b3cbbeb1b4f1d939d5659..0f8c89c9f83243532c57dded20c5fc1be0893b91 100644 (file)
--- a/arch/avr32/mach-at32ap/clock.c
+++ b/arch/avr32/mach-at32ap/clock.c
@@ -18,7 +18,7 @@
 
 #include "clock.h"
 
-static spinlock_t clk_lock = SPIN_LOCK_UNLOCKED;
+static DEFINE_SPINLOCK(clk_lock);
 
 struct clk *clk_get(struct device *dev, const char *id)
 {