git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'linus' into x86/urgent
[pandora-kernel.git]
/
drivers
/
rtc
/
rtc-omap.c
diff --git
a/drivers/rtc/rtc-omap.c
b/drivers/rtc/rtc-omap.c
index
58f81c7
..
eb23d84
100644
(file)
--- a/
drivers/rtc/rtc-omap.c
+++ b/
drivers/rtc/rtc-omap.c
@@
-22,7
+22,6
@@
#include <linux/platform_device.h>
#include <asm/io.h>
-#include <asm/mach/time.h>
/* The OMAP1 RTC is a year/month/day/hours/minutes/seconds BCD clock