diff options
| author | Ingo Molnar <mingo@elte.hu> | 2008-07-18 15:13:20 -0400 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2008-07-18 15:13:20 -0400 |
| commit | f6dc8ccaab6d8f63cbae1e6c73fe972b26f5376c (patch) | |
| tree | c5643fcdc884a8d0bfc3f1bc28039cab7394e5bc /drivers/rtc/rtc-omap.c | |
| parent | 323ec001c6bb98eeabb5abbdbb8c8055d9496554 (diff) | |
| parent | 5b664cb235e97afbf34db9c4d77f08ebd725335e (diff) | |
Merge branch 'linus' into core/generic-dma-coherent
Conflicts:
kernel/Makefile
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'drivers/rtc/rtc-omap.c')
| -rw-r--r-- | drivers/rtc/rtc-omap.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/drivers/rtc/rtc-omap.c b/drivers/rtc/rtc-omap.c index 58f81c774943..eb23d8423f42 100644 --- a/drivers/rtc/rtc-omap.c +++ b/drivers/rtc/rtc-omap.c | |||
| @@ -22,7 +22,6 @@ | |||
| 22 | #include <linux/platform_device.h> | 22 | #include <linux/platform_device.h> |
| 23 | 23 | ||
| 24 | #include <asm/io.h> | 24 | #include <asm/io.h> |
| 25 | #include <asm/mach/time.h> | ||
| 26 | 25 | ||
| 27 | 26 | ||
| 28 | /* The OMAP1 RTC is a year/month/day/hours/minutes/seconds BCD clock | 27 | /* The OMAP1 RTC is a year/month/day/hours/minutes/seconds BCD clock |