diff options
author | Roman Zippel <zippel@linux-m68k.org> | 2006-06-25 08:47:03 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-06-25 13:00:57 -0400 |
commit | 35353bb8b869f3a0a153d0674cdafbe4f64aaa05 (patch) | |
tree | 26b9c36b3ad1d03c810c13bb81e159bdbe782b9f /arch/m68k/hp300/config.c | |
parent | 734085651c9b80aa3f9e6027b156102de214a0b2 (diff) |
[PATCH] m68k: convert hp300 irq code
Signed-off-by: Roman Zippel <zippel@linux-m68k.org>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'arch/m68k/hp300/config.c')
-rw-r--r-- | arch/m68k/hp300/config.c | 11 |
1 files changed, 4 insertions, 7 deletions
diff --git a/arch/m68k/hp300/config.c b/arch/m68k/hp300/config.c index 6d129eef370f..2ef271cd818b 100644 --- a/arch/m68k/hp300/config.c +++ b/arch/m68k/hp300/config.c | |||
@@ -21,7 +21,6 @@ | |||
21 | #include <asm/hp300hw.h> | 21 | #include <asm/hp300hw.h> |
22 | #include <asm/rtc.h> | 22 | #include <asm/rtc.h> |
23 | 23 | ||
24 | #include "ints.h" | ||
25 | #include "time.h" | 24 | #include "time.h" |
26 | 25 | ||
27 | unsigned long hp300_model; | 26 | unsigned long hp300_model; |
@@ -64,8 +63,6 @@ static char *hp300_models[] __initdata = { | |||
64 | static char hp300_model_name[13] = "HP9000/"; | 63 | static char hp300_model_name[13] = "HP9000/"; |
65 | 64 | ||
66 | extern void hp300_reset(void); | 65 | extern void hp300_reset(void); |
67 | extern irqreturn_t (*hp300_default_handler[])(int, void *, struct pt_regs *); | ||
68 | extern int show_hp300_interrupts(struct seq_file *, void *); | ||
69 | #ifdef CONFIG_SERIAL_8250_CONSOLE | 66 | #ifdef CONFIG_SERIAL_8250_CONSOLE |
70 | extern int hp300_setup_serial_console(void) __init; | 67 | extern int hp300_setup_serial_console(void) __init; |
71 | #endif | 68 | #endif |
@@ -245,16 +242,16 @@ static unsigned int hp300_get_ss(void) | |||
245 | hp300_rtc_read(RTC_REG_SEC2); | 242 | hp300_rtc_read(RTC_REG_SEC2); |
246 | } | 243 | } |
247 | 244 | ||
245 | static void __init hp300_init_IRQ(void) | ||
246 | { | ||
247 | } | ||
248 | |||
248 | void __init config_hp300(void) | 249 | void __init config_hp300(void) |
249 | { | 250 | { |
250 | mach_sched_init = hp300_sched_init; | 251 | mach_sched_init = hp300_sched_init; |
251 | mach_init_IRQ = hp300_init_IRQ; | 252 | mach_init_IRQ = hp300_init_IRQ; |
252 | mach_request_irq = hp300_request_irq; | ||
253 | mach_free_irq = hp300_free_irq; | ||
254 | mach_get_model = hp300_get_model; | 253 | mach_get_model = hp300_get_model; |
255 | mach_get_irq_list = show_hp300_interrupts; | ||
256 | mach_gettimeoffset = hp300_gettimeoffset; | 254 | mach_gettimeoffset = hp300_gettimeoffset; |
257 | mach_default_handler = &hp300_default_handler; | ||
258 | mach_hwclk = hp300_hwclk; | 255 | mach_hwclk = hp300_hwclk; |
259 | mach_get_ss = hp300_get_ss; | 256 | mach_get_ss = hp300_get_ss; |
260 | mach_reset = hp300_reset; | 257 | mach_reset = hp300_reset; |