diff options
| author | Stephen Rothwell <sfr@canb.auug.org.au> | 2008-03-13 16:57:17 +1100 |
|---|---|---|
| committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2008-03-13 16:57:17 +1100 |
| commit | c06ab71e9852d00150f82a26bcdfa5657911a9c5 (patch) | |
| tree | a186847292d74610f5f07035837877b39b1fa5fb /arch/arm/common/rtctime.c | |
| parent | 26a9fe3d937ea501f9c0c100a1b0f159551fd963 (diff) | |
| parent | 6fcc0ef3af13bcdb603250755b916e423ce4b065 (diff) | |
Merge commit 'semaphore/semaphore'
Conflicts:
Documentation/feature-removal-schedule.txt
drivers/base/core.c
drivers/firewire/fw-device.c
Diffstat (limited to 'arch/arm/common/rtctime.c')
| -rw-r--r-- | arch/arm/common/rtctime.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/arch/arm/common/rtctime.c b/arch/arm/common/rtctime.c index f53bca46e23c..aa8f7739c822 100644 --- a/arch/arm/common/rtctime.c +++ b/arch/arm/common/rtctime.c @@ -22,7 +22,6 @@ #include <linux/mutex.h> #include <asm/rtc.h> -#include <asm/semaphore.h> static DECLARE_WAIT_QUEUE_HEAD(rtc_wait); static struct fasync_struct *rtc_async_queue; |