diff options
| author | Ingo Molnar <mingo@elte.hu> | 2008-09-05 12:56:57 -0400 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2008-09-05 12:56:57 -0400 |
| commit | 616ad8c44281c0c6711a72b560e01ec335ff27e0 (patch) | |
| tree | 0a20453ffedb09db6fb41a0c2208ccc2c7751d3a /drivers/char/rtc.c | |
| parent | 99809963c99e1ed868d9ebeb4a5e7ee1cbe0309f (diff) | |
| parent | b380b0d4f7dffcc235c0facefa537d4655619101 (diff) | |
Merge branch 'linus' into x86/defconfig
Diffstat (limited to 'drivers/char/rtc.c')
| -rw-r--r-- | drivers/char/rtc.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/drivers/char/rtc.c b/drivers/char/rtc.c index d9799e2bcfbf..f53d4d00faf0 100644 --- a/drivers/char/rtc.c +++ b/drivers/char/rtc.c | |||
| @@ -78,7 +78,6 @@ | |||
| 78 | #include <linux/wait.h> | 78 | #include <linux/wait.h> |
| 79 | #include <linux/bcd.h> | 79 | #include <linux/bcd.h> |
| 80 | #include <linux/delay.h> | 80 | #include <linux/delay.h> |
| 81 | #include <linux/smp_lock.h> | ||
| 82 | #include <linux/uaccess.h> | 81 | #include <linux/uaccess.h> |
| 83 | 82 | ||
| 84 | #include <asm/current.h> | 83 | #include <asm/current.h> |