| From 410859a0a0aee43e016051882f3bdd99f520e45e Mon Sep 17 00:00:00 2001 |
| From: Magnus Damm <damm@opensource.se> |
| Date: Thu, 1 Aug 2013 04:02:42 +0900 |
| Subject: ARM: shmobile: Use default ->init_time() on Marzen DT ref |
| |
| Leave ->init_time() set to NULL to use the default ARM behaviour. |
| |
| Signed-off-by: Magnus Damm <damm@opensource.se> |
| Signed-off-by: Simon Horman <horms+renesas@verge.net.au> |
| (cherry picked from commit 3b2e2aa319a886ab15052b513813ced39503dfa7) |
| Signed-off-by: Simon Horman <horms+renesas@verge.net.au> |
| --- |
| arch/arm/mach-shmobile/board-marzen-reference.c | 1 - |
| 1 file changed, 1 deletion(-) |
| |
| diff --git a/arch/arm/mach-shmobile/board-marzen-reference.c b/arch/arm/mach-shmobile/board-marzen-reference.c |
| index 3d1c439b..3f4250a2 100644 |
| --- a/arch/arm/mach-shmobile/board-marzen-reference.c |
| +++ b/arch/arm/mach-shmobile/board-marzen-reference.c |
| @@ -42,6 +42,5 @@ DT_MACHINE_START(MARZEN, "marzen") |
| .nr_irqs = NR_IRQS_LEGACY, |
| .init_irq = r8a7779_init_irq_dt, |
| .init_machine = marzen_init, |
| - .init_time = shmobile_timer_init, |
| .dt_compat = marzen_boards_compat_dt, |
| MACHINE_END |
| -- |
| 1.8.4.3.gca3854a |
| |
