diff options
Diffstat (limited to 'arch/mips/jazz')
-rw-r--r-- | arch/mips/jazz/irq.c | 2 | ||||
-rw-r--r-- | arch/mips/jazz/setup.c | 3 |
2 files changed, 2 insertions, 3 deletions
diff --git a/arch/mips/jazz/irq.c b/arch/mips/jazz/irq.c index 478be9858a1e..eef05093deb4 100644 --- a/arch/mips/jazz/irq.c +++ b/arch/mips/jazz/irq.c | |||
@@ -55,7 +55,7 @@ static void end_r4030_irq(unsigned int irq) | |||
55 | enable_r4030_irq(irq); | 55 | enable_r4030_irq(irq); |
56 | } | 56 | } |
57 | 57 | ||
58 | static struct hw_interrupt_type r4030_irq_type = { | 58 | static struct irq_chip r4030_irq_type = { |
59 | .typename = "R4030", | 59 | .typename = "R4030", |
60 | .startup = startup_r4030_irq, | 60 | .startup = startup_r4030_irq, |
61 | .shutdown = shutdown_r4030_irq, | 61 | .shutdown = shutdown_r4030_irq, |
diff --git a/arch/mips/jazz/setup.c b/arch/mips/jazz/setup.c index 385413e30fdd..487a9ea1ef00 100644 --- a/arch/mips/jazz/setup.c +++ b/arch/mips/jazz/setup.c | |||
@@ -37,7 +37,7 @@ extern void jazz_machine_restart(char *command); | |||
37 | extern void jazz_machine_halt(void); | 37 | extern void jazz_machine_halt(void); |
38 | extern void jazz_machine_power_off(void); | 38 | extern void jazz_machine_power_off(void); |
39 | 39 | ||
40 | static void __init jazz_time_init(struct irqaction *irq) | 40 | void __init plat_time_init(struct irqaction *irq) |
41 | { | 41 | { |
42 | /* set the clock to 100 Hz */ | 42 | /* set the clock to 100 Hz */ |
43 | r4030_write_reg32(JAZZ_TIMER_INTERVAL, 9); | 43 | r4030_write_reg32(JAZZ_TIMER_INTERVAL, 9); |
@@ -75,7 +75,6 @@ void __init plat_mem_setup(void) | |||
75 | for (i = 0; i < ARRAY_SIZE(jazz_io_resources); i++) | 75 | for (i = 0; i < ARRAY_SIZE(jazz_io_resources); i++) |
76 | request_resource(&ioport_resource, jazz_io_resources + i); | 76 | request_resource(&ioport_resource, jazz_io_resources + i); |
77 | 77 | ||
78 | board_timer_setup = jazz_time_init; | ||
79 | /* The RTC is outside the port address space */ | 78 | /* The RTC is outside the port address space */ |
80 | 79 | ||
81 | _machine_restart = jazz_machine_restart; | 80 | _machine_restart = jazz_machine_restart; |