diff --git a/[refs] b/[refs]
index d65190c59a4c..d4dd171b1485 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 0f17e4c796e89d1f69f13b653aba60e6ccfb8ae0
+refs/heads/master: 6310e472717ed736c9bff9840febb71f7bb400ed
diff --git a/trunk/arch/arm/mach-ns9xxx/clock.c b/trunk/arch/arm/mach-ns9xxx/clock.c
index f8639161068f..44ed20d4a388 100644
--- a/trunk/arch/arm/mach-ns9xxx/clock.c
+++ b/trunk/arch/arm/mach-ns9xxx/clock.c
@@ -14,8 +14,8 @@
 #include <linux/clk.h>
 #include <linux/string.h>
 #include <linux/platform_device.h>
+#include <linux/semaphore.h>
 
-#include <asm/semaphore.h>
 #include "clock.h"
 
 static LIST_HEAD(clocks);