diff options
| author | David S. Miller <davem@davemloft.net> | 2010-02-28 22:23:06 -0500 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2010-02-28 22:23:06 -0500 |
| commit | 47871889c601d8199c51a4086f77eebd77c29b0b (patch) | |
| tree | 40cdcac3bff0ee40cc33dcca61d0577cdf965f77 /arch/sh/include/mach-dreamcast/mach/sysasic.h | |
| parent | c16cc0b464b8876cfd57ce1c1dbcb6f9a6a0bce3 (diff) | |
| parent | 30ff056c42c665b9ea535d8515890857ae382540 (diff) | |
Merge branch 'master' of /home/davem/src/GIT/linux-2.6/
Conflicts:
drivers/firmware/iscsi_ibft.c
Diffstat (limited to 'arch/sh/include/mach-dreamcast/mach/sysasic.h')
| -rw-r--r-- | arch/sh/include/mach-dreamcast/mach/sysasic.h | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/arch/sh/include/mach-dreamcast/mach/sysasic.h b/arch/sh/include/mach-dreamcast/mach/sysasic.h index f33426608a87..58f710e1ebc2 100644 --- a/arch/sh/include/mach-dreamcast/mach/sysasic.h +++ b/arch/sh/include/mach-dreamcast/mach/sysasic.h | |||
| @@ -39,5 +39,10 @@ | |||
| 39 | 39 | ||
| 40 | #define HW_EVENT_IRQ_MAX (HW_EVENT_IRQ_BASE + 95) | 40 | #define HW_EVENT_IRQ_MAX (HW_EVENT_IRQ_BASE + 95) |
| 41 | 41 | ||
| 42 | /* arch/sh/boards/mach-dreamcast/irq.c */ | ||
| 43 | extern int systemasic_irq_demux(int); | ||
| 44 | extern void systemasic_irq_init(void); | ||
| 45 | extern void aica_time_init(void); | ||
| 46 | |||
| 42 | #endif /* __ASM_SH_DREAMCAST_SYSASIC_H */ | 47 | #endif /* __ASM_SH_DREAMCAST_SYSASIC_H */ |
| 43 | 48 | ||