git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/cooloney...
[pandora-kernel.git]
/
arch
/
arm
/
mach-ns9xxx
/
clock.c
diff --git
a/arch/arm/mach-ns9xxx/clock.c
b/arch/arm/mach-ns9xxx/clock.c
index
f863916
..
44ed20d
100644
(file)
--- a/
arch/arm/mach-ns9xxx/clock.c
+++ b/
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/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);
#include "clock.h"
static LIST_HEAD(clocks);