diff options
author | David Woodhouse <dwmw2@infradead.org> | 2008-04-22 12:34:25 +0100 |
---|---|---|
committer | David Woodhouse <dwmw2@infradead.org> | 2008-04-22 12:34:25 +0100 |
commit | f838bad1b3be8ca0c785ee0e0c570dfda74cf377 (patch) | |
tree | 5a842a8056a708cfad55a20fa8ab733dd94b0903 /arch/arm/mach-aaec2000/clock.c | |
parent | dd919660aacdf4adfcd279556aa03e595f7f0fc2 (diff) | |
parent | 807501475fce0ebe68baedf87f202c3e4ee0d12c (diff) | |
download | kernel-crypto-f838bad1b3be8ca0c785ee0e0c570dfda74cf377.tar.gz kernel-crypto-f838bad1b3be8ca0c785ee0e0c570dfda74cf377.tar.xz kernel-crypto-f838bad1b3be8ca0c785ee0e0c570dfda74cf377.zip |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
Diffstat (limited to 'arch/arm/mach-aaec2000/clock.c')
-rw-r--r-- | arch/arm/mach-aaec2000/clock.c | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/arch/arm/mach-aaec2000/clock.c b/arch/arm/mach-aaec2000/clock.c index 74aa7a39bb6..e10ee158d72 100644 --- a/arch/arm/mach-aaec2000/clock.c +++ b/arch/arm/mach-aaec2000/clock.c @@ -18,8 +18,6 @@ #include <linux/clk.h> #include <linux/mutex.h> -#include <asm/semaphore.h> - #include "clock.h" static LIST_HEAD(clocks); |