Merge branch 'linus' into x86/amd-iommu

[linux-2.6] / arch / arm / mach-integrator / clock.c

diff --git a/arch/arm/mach-integrator/clock.c b/arch/arm/mach-integrator/clock.c
index 95a1e263f7fa59e488adecdba1f0637005528471..8d761fdd2ecdaf3b44ea2e0f926f581963780766 100644 (file)
--- a/arch/arm/mach-integrator/clock.c
+++ b/arch/arm/mach-integrator/clock.c
@@ -17,7 +17,6 @@
 #include <linux/clk.h>
 #include <linux/mutex.h>
 
-#include <asm/semaphore.h>
 #include <asm/hardware/icst525.h>
 
 #include "clock.h"