summaryrefslogtreecommitdiffstats
path: root/arch
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2008-07-24 12:24:40 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2008-07-24 12:24:40 -0700
commit7540081c6b16dc941895bca840749cabfd0d3b48 (patch)
tree9e6b2270d700bf99489b570aa2b4c2c0b6cd0ead /arch
parent3fde80e94c2bbffbb13f5faa3340cf438440ebea (diff)
parentb552068999b0b05087c454e525b30b785c79dc9b (diff)
downloadop-kernel-dev-7540081c6b16dc941895bca840749cabfd0d3b48.zip
op-kernel-dev-7540081c6b16dc941895bca840749cabfd0d3b48.tar.gz
Merge branch 'semaphore' of git://git.kernel.org/pub/scm/linux/kernel/git/willy/misc
* 'semaphore' of git://git.kernel.org/pub/scm/linux/kernel/git/willy/misc: Remove __DECLARE_SEMAPHORE_GENERIC Remove asm/semaphore.h Remove use of asm/semaphore.h Add missing semaphore.h includes Remove mention of semaphores from kernel-locking
Diffstat (limited to 'arch')
-rw-r--r--arch/arm/mach-ns9xxx/clock.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/mach-ns9xxx/clock.c b/arch/arm/mach-ns9xxx/clock.c
index f863916..44ed20d 100644
--- 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/semaphore.h>
-#include <asm/semaphore.h>
#include "clock.h"
static LIST_HEAD(clocks);
OpenPOWER on IntegriCloud