projects
/
powerpc.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge ../linux-2.6
[powerpc.git]
/
arch
/
ppc
/
syslib
/
m8xx_wdt.c
diff --git
a/arch/ppc/syslib/m8xx_wdt.c
b/arch/ppc/syslib/m8xx_wdt.c
index
df6c955
..
ac11d7b
100644
(file)
--- a/
arch/ppc/syslib/m8xx_wdt.c
+++ b/
arch/ppc/syslib/m8xx_wdt.c
@@
-41,8
+41,7
@@
static irqreturn_t m8xx_wdt_interrupt(int irq, void *dev, struct pt_regs *regs)
m8xx_wdt_reset();
- out_be16(&imap->im_sit.sit_piscr, in_be16(&imap->im_sit.sit_piscr) | PISCR_PS); /* clear irq */
-
+ setbits16(&imap->im_sit.sit_piscr, PISCR_PS);
return IRQ_HANDLED;
}