projects
/
GitHub
/
MotorolaMobilityLLC
/
kernel-slsi.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
7fe19da
)
sh: mach-se: Fix up SE7206 no ioport build.
author
Paul Mundt
<lethal@linux-sh.org>
Thu, 4 Nov 2010 03:29:00 +0000
(12:29 +0900)
committer
Paul Mundt
<lethal@linux-sh.org>
Thu, 4 Nov 2010 03:29:00 +0000
(12:29 +0900)
There was a leftover inw() used here that really just wants to be a
__raw_readw() instead. Convert it over.
Signed-off-by: Paul Mundt <lethal@linux-sh.org>
arch/sh/boards/mach-se/7206/irq.c
patch
|
blob
|
blame
|
history
diff --git
a/arch/sh/boards/mach-se/7206/irq.c
b/arch/sh/boards/mach-se/7206/irq.c
index 883b21eacaa686d00efbf822911dac79e6e220d5..d961949600fd462199f3d9706e86371e815e7b1b 100644
(file)
--- a/
arch/sh/boards/mach-se/7206/irq.c
+++ b/
arch/sh/boards/mach-se/7206/irq.c
@@
-139,11
+139,13
@@
void __init init_se7206_IRQ(void)
make_se7206_irq(IRQ0_IRQ); /* SMC91C111 */
make_se7206_irq(IRQ1_IRQ); /* ATA */
make_se7206_irq(IRQ3_IRQ); /* SLOT / PCM */
- __raw_writew(inw(INTC_ICR1) | 0x000b ,INTC_ICR1 ) ; /* ICR1 */
+
+ __raw_writew(__raw_readw(INTC_ICR1) | 0x000b, INTC_ICR); /* ICR1 */
/* FPGA System register setup*/
__raw_writew(0x0000,INTSTS0); /* Clear INTSTS0 */
__raw_writew(0x0000,INTSTS1); /* Clear INTSTS1 */
+
/* IRQ0=LAN, IRQ1=ATA, IRQ3=SLT,PCM */
__raw_writew(0x0001,INTSEL);
}