diff options
| author | Linus Torvalds <torvalds@g5.osdl.org> | 2006-10-12 11:33:23 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-10-12 11:33:23 -0400 |
| commit | 9eb200748878751310cd9848c5dd4d467960beec (patch) | |
| tree | 16458876279abbc597843a7c1bb8216474691380 /arch/sh/boards/snapgear/setup.c | |
| parent | 8770c018da7bbaa3b41371abc401b2aa7e76a71a (diff) | |
| parent | 8ae91b9ad88a130cd50fc0b78b16e7b9510b8067 (diff) | |
Merge master.kernel.org:/pub/scm/linux/kernel/git/lethal/sh-2.6
* master.kernel.org:/pub/scm/linux/kernel/git/lethal/sh-2.6:
sh: SH-4A UBC support
sh: interrupt exception handling rework
sh: Default enable R7780RP IRQs.
sh: Zero-out coherent buffer in consistent_alloc().
sh: Convert IPR-IRQ to IRQ chip.
sh: Convert INTC2 IRQ handler to irq_chip.
sh: Fix pr_debug statements for sh4
sh: Convert r7780rp IRQ handler to IRQ chip.
sh: Updates for IRQ handler changes.
sh: Kill off timer_ops get_frequency().
sh: First step at generic timeofday support.
Diffstat (limited to 'arch/sh/boards/snapgear/setup.c')
| -rw-r--r-- | arch/sh/boards/snapgear/setup.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/sh/boards/snapgear/setup.c b/arch/sh/boards/snapgear/setup.c index f5e98c56b530..540d0bf16446 100644 --- a/arch/sh/boards/snapgear/setup.c +++ b/arch/sh/boards/snapgear/setup.c | |||
| @@ -33,7 +33,7 @@ extern void pcibios_init(void); | |||
| 33 | * EraseConfig handling functions | 33 | * EraseConfig handling functions |
| 34 | */ | 34 | */ |
| 35 | 35 | ||
| 36 | static irqreturn_t eraseconfig_interrupt(int irq, void *dev_id, struct pt_regs *regs) | 36 | static irqreturn_t eraseconfig_interrupt(int irq, void *dev_id) |
| 37 | { | 37 | { |
| 38 | volatile char dummy __attribute__((unused)) = * (volatile char *) 0xb8000000; | 38 | volatile char dummy __attribute__((unused)) = * (volatile char *) 0xb8000000; |
| 39 | 39 | ||