diff options
| author | David Woodhouse <dwmw2@infradead.org> | 2007-04-26 04:31:28 -0400 |
|---|---|---|
| committer | David Woodhouse <dwmw2@infradead.org> | 2007-04-26 04:31:28 -0400 |
| commit | ef2e58ea6b9931c3a4816c66593da49bb20e3b24 (patch) | |
| tree | ce7432add3becbe78de4ea06425cd2d9e91f4ada /arch/mips/sni/pcit.c | |
| parent | 06d63cc51d47f572009138a7f3ac34d95773405d (diff) | |
| parent | de46c33745f5e2ad594c72f2cf5f490861b16ce1 (diff) | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
Diffstat (limited to 'arch/mips/sni/pcit.c')
| -rw-r--r-- | arch/mips/sni/pcit.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/mips/sni/pcit.c b/arch/mips/sni/pcit.c index 8d6b3d5b13a1..1dfc3f00bbd3 100644 --- a/arch/mips/sni/pcit.c +++ b/arch/mips/sni/pcit.c | |||
| @@ -271,7 +271,7 @@ static void pcit_hwint0(void) | |||
| 271 | 271 | ||
| 272 | static void sni_pcit_hwint(void) | 272 | static void sni_pcit_hwint(void) |
| 273 | { | 273 | { |
| 274 | u32 pending = (read_c0_cause() & read_c0_status()); | 274 | u32 pending = read_c0_cause() & read_c0_status(); |
| 275 | 275 | ||
| 276 | if (pending & C_IRQ1) | 276 | if (pending & C_IRQ1) |
| 277 | pcit_hwint1(); | 277 | pcit_hwint1(); |
| @@ -285,7 +285,7 @@ static void sni_pcit_hwint(void) | |||
| 285 | 285 | ||
| 286 | static void sni_pcit_hwint_cplus(void) | 286 | static void sni_pcit_hwint_cplus(void) |
| 287 | { | 287 | { |
| 288 | u32 pending = (read_c0_cause() & read_c0_status()); | 288 | u32 pending = read_c0_cause() & read_c0_status(); |
| 289 | 289 | ||
| 290 | if (pending & C_IRQ0) | 290 | if (pending & C_IRQ0) |
| 291 | pcit_hwint0(); | 291 | pcit_hwint0(); |