aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPaul Mundt <lethal@linux-sh.org>2010-11-04 12:29:00 +0900
committerPaul Mundt <lethal@linux-sh.org>2010-11-04 12:29:00 +0900
commite96ce8ebfd7427c7ce335028f6619fb549f366b2 (patch)
treea3b496f2ebb20d188d685becc407f4280016900e
parent7fe19da4ca38fc20cdbc7020fcf2eca8fc756410 (diff)
downloadkernel_samsung_crespo-e96ce8ebfd7427c7ce335028f6619fb549f366b2.zip
kernel_samsung_crespo-e96ce8ebfd7427c7ce335028f6619fb549f366b2.tar.gz
kernel_samsung_crespo-e96ce8ebfd7427c7ce335028f6619fb549f366b2.tar.bz2
sh: mach-se: Fix up SE7206 no ioport build.
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>
-rw-r--r--arch/sh/boards/mach-se/7206/irq.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/arch/sh/boards/mach-se/7206/irq.c b/arch/sh/boards/mach-se/7206/irq.c
index 883b21e..d961949 100644
--- 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);
}