diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2008-07-24 15:24:40 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2008-07-24 15:24:40 -0400 |
| commit | 7540081c6b16dc941895bca840749cabfd0d3b48 (patch) | |
| tree | 9e6b2270d700bf99489b570aa2b4c2c0b6cd0ead /arch | |
| parent | 3fde80e94c2bbffbb13f5faa3340cf438440ebea (diff) | |
| parent | b552068999b0b05087c454e525b30b785c79dc9b (diff) | |
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.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/mach-ns9xxx/clock.c b/arch/arm/mach-ns9xxx/clock.c index f8639161068f..44ed20d4a388 100644 --- a/arch/arm/mach-ns9xxx/clock.c +++ b/arch/arm/mach-ns9xxx/clock.c | |||
| @@ -14,8 +14,8 @@ | |||
| 14 | #include <linux/clk.h> | 14 | #include <linux/clk.h> |
| 15 | #include <linux/string.h> | 15 | #include <linux/string.h> |
| 16 | #include <linux/platform_device.h> | 16 | #include <linux/platform_device.h> |
| 17 | #include <linux/semaphore.h> | ||
| 17 | 18 | ||
| 18 | #include <asm/semaphore.h> | ||
| 19 | #include "clock.h" | 19 | #include "clock.h" |
| 20 | 20 | ||
| 21 | static LIST_HEAD(clocks); | 21 | static LIST_HEAD(clocks); |