diff options
| author | Tony Lindgren <tony@atomide.com> | 2010-03-01 14:19:05 -0800 |
|---|---|---|
| committer | Tony Lindgren <tony@atomide.com> | 2010-03-01 14:19:05 -0800 |
| commit | d702d12167a2c05a346f49aac7a311d597762495 (patch) | |
| tree | baae42c299cce34d6df24b5d01f8b1d0b481bd9a /arch/sh/boards/mach-dreamcast/setup.c | |
| parent | 9418c65f9bd861d0f7e39aab9cfb3aa6f2275d11 (diff) | |
| parent | ac0f6f927db539e03e1f3f61bcd4ed57d5cde7a9 (diff) | |
| download | kernel_samsung_smdk4412-d702d12167a2c05a346f49aac7a311d597762495.zip kernel_samsung_smdk4412-d702d12167a2c05a346f49aac7a311d597762495.tar.gz kernel_samsung_smdk4412-d702d12167a2c05a346f49aac7a311d597762495.tar.bz2 | |
Merge with mainline to remove plat-omap/Kconfig conflict
Conflicts:
arch/arm/plat-omap/Kconfig
Diffstat (limited to 'arch/sh/boards/mach-dreamcast/setup.c')
| -rw-r--r-- | arch/sh/boards/mach-dreamcast/setup.c | 18 |
1 files changed, 1 insertions, 17 deletions
diff --git a/arch/sh/boards/mach-dreamcast/setup.c b/arch/sh/boards/mach-dreamcast/setup.c index a4b7402..ad1a4db 100644 --- a/arch/sh/boards/mach-dreamcast/setup.c +++ b/arch/sh/boards/mach-dreamcast/setup.c @@ -28,25 +28,8 @@ #include <asm/machvec.h> #include <mach/sysasic.h> -extern struct irq_chip systemasic_int; -extern void aica_time_init(void); -extern int systemasic_irq_demux(int); - static void __init dreamcast_setup(char **cmdline_p) { - int i; - - /* Mask all hardware events */ - /* XXX */ - - /* Acknowledge any previous events */ - /* XXX */ - - /* Assign all virtual IRQs to the System ASIC int. handler */ - for (i = HW_EVENT_IRQ_BASE; i < HW_EVENT_IRQ_MAX; i++) - set_irq_chip_and_handler(i, &systemasic_int, - handle_level_irq); - board_time_init = aica_time_init; } @@ -54,4 +37,5 @@ static struct sh_machine_vector mv_dreamcast __initmv = { .mv_name = "Sega Dreamcast", .mv_setup = dreamcast_setup, .mv_irq_demux = systemasic_irq_demux, + .mv_init_irq = systemasic_irq_init, }; |