diff options
author | Paul Mundt <lethal@linux-sh.org> | 2012-01-11 22:57:41 -0500 |
---|---|---|
committer | Paul Mundt <lethal@linux-sh.org> | 2012-01-11 22:57:41 -0500 |
commit | 9d14070f656addddce3d63fd483de46930b51850 (patch) | |
tree | a8767c2547dd2b6f49974503a5169d8c08de00e9 /arch/sh/kernel/time.c | |
parent | 9f06cf38eca57e279b4c78e465e19f10c2f78174 (diff) | |
parent | a319add1e24c43d285b781332cfa532405466650 (diff) |
Merge branch 'sh/hwblk' into sh-latest
Diffstat (limited to 'arch/sh/kernel/time.c')
-rw-r--r-- | arch/sh/kernel/time.c | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/arch/sh/kernel/time.c b/arch/sh/kernel/time.c index 8a0072de2bc..552c8fcf941 100644 --- a/arch/sh/kernel/time.c +++ b/arch/sh/kernel/time.c | |||
@@ -21,7 +21,6 @@ | |||
21 | #include <linux/smp.h> | 21 | #include <linux/smp.h> |
22 | #include <linux/rtc.h> | 22 | #include <linux/rtc.h> |
23 | #include <asm/clock.h> | 23 | #include <asm/clock.h> |
24 | #include <asm/hwblk.h> | ||
25 | #include <asm/rtc.h> | 24 | #include <asm/rtc.h> |
26 | 25 | ||
27 | /* Dummy RTC ops */ | 26 | /* Dummy RTC ops */ |
@@ -110,7 +109,6 @@ void __init time_init(void) | |||
110 | if (board_time_init) | 109 | if (board_time_init) |
111 | board_time_init(); | 110 | board_time_init(); |
112 | 111 | ||
113 | hwblk_init(); | ||
114 | clk_init(); | 112 | clk_init(); |
115 | 113 | ||
116 | late_time_init = sh_late_time_init; | 114 | late_time_init = sh_late_time_init; |