diff options
| author | Paul Mundt <lethal@linux-sh.org> | 2009-07-06 20:19:28 +0900 |
|---|---|---|
| committer | Paul Mundt <lethal@linux-sh.org> | 2009-07-06 20:19:28 +0900 |
| commit | 7119888df1fd115573616ae43747b2e823b0663e (patch) | |
| tree | cfe0c769b4e7bf8323d1958c46590d6200516a29 /arch/sh/kernel/time.c | |
| parent | c652d780c9cf7f860141de232b37160fe013feca (diff) | |
| parent | 0f60bb25b4036d30fd795709be09626c58c52464 (diff) | |
| download | linux-7119888df1fd115573616ae43747b2e823b0663e.tar.gz linux-7119888df1fd115573616ae43747b2e823b0663e.tar.bz2 linux-7119888df1fd115573616ae43747b2e823b0663e.zip | |
Merge branches 'sh/ftrace' and 'sh/cachetlb'
Diffstat (limited to 'arch/sh/kernel/time.c')
| -rw-r--r-- | arch/sh/kernel/time.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/arch/sh/kernel/time.c b/arch/sh/kernel/time.c index 9b352a1e3fb4..d2424b068b7b 100644 --- a/arch/sh/kernel/time.c +++ b/arch/sh/kernel/time.c @@ -21,6 +21,7 @@ #include <linux/smp.h> #include <linux/rtc.h> #include <asm/clock.h> +#include <asm/hwblk.h> #include <asm/rtc.h> /* Dummy RTC ops */ @@ -96,6 +97,7 @@ void __init time_init(void) if (board_time_init) board_time_init(); + hwblk_init(); clk_init(); rtc_sh_get_time(&xtime); |