diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2010-12-27 19:34:09 +0100 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2010-12-27 19:34:09 +0100 |
commit | c816d7c64e82cae69fa5c7365474d37444a97ccf (patch) | |
tree | 19db5f3f47f7e6d65f8e35fcc0faa465f8c998fc /arch/sh/boards/mach-se/7206/irq.c | |
parent | Merge branch 'fbdev-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/ke... (diff) | |
parent | sh: intc: Initialize radix tree gfp mask explicitly. (diff) | |
download | linux-c816d7c64e82cae69fa5c7365474d37444a97ccf.tar.xz linux-c816d7c64e82cae69fa5c7365474d37444a97ccf.zip |
Merge branch 'sh-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/lethal/sh-2.6
* 'sh-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/lethal/sh-2.6:
sh: intc: Initialize radix tree gfp mask explicitly.
sh: Fix up SH7201 clkfwk build.
sh: mach-se: Fix up SE7206 build.
sh: Fix up SH4-202 clkfwk build.
Diffstat (limited to 'arch/sh/boards/mach-se/7206/irq.c')
-rw-r--r-- | arch/sh/boards/mach-se/7206/irq.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/sh/boards/mach-se/7206/irq.c b/arch/sh/boards/mach-se/7206/irq.c index d961949600fd..9070d7e60704 100644 --- a/arch/sh/boards/mach-se/7206/irq.c +++ b/arch/sh/boards/mach-se/7206/irq.c @@ -140,7 +140,7 @@ void __init init_se7206_IRQ(void) make_se7206_irq(IRQ1_IRQ); /* ATA */ make_se7206_irq(IRQ3_IRQ); /* SLOT / PCM */ - __raw_writew(__raw_readw(INTC_ICR1) | 0x000b, INTC_ICR); /* ICR1 */ + __raw_writew(__raw_readw(INTC_ICR1) | 0x000b, INTC_ICR1); /* ICR1 */ /* FPGA System register setup*/ __raw_writew(0x0000,INTSTS0); /* Clear INTSTS0 */ |