diff options
author | Trond Myklebust <Trond.Myklebust@netapp.com> | 2006-03-23 23:44:19 -0500 |
---|---|---|
committer | Trond Myklebust <Trond.Myklebust@netapp.com> | 2006-03-23 23:44:19 -0500 |
commit | 1ebbe2b20091d306453a5cf480a87e6cd28ae76f (patch) | |
tree | f5cd7a0fa69b8b1938cb5a0faed2e7b0628072a5 /arch/mips/pci/pci-ip27.c | |
parent | ac58c9059da8886b5e8cde012a80266b18ca146e (diff) | |
parent | 674a396c6d2ba0341ebdd7c1c9950f32f018e2dd (diff) |
Merge branch 'linus'
Diffstat (limited to 'arch/mips/pci/pci-ip27.c')
-rw-r--r-- | arch/mips/pci/pci-ip27.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/arch/mips/pci/pci-ip27.c b/arch/mips/pci/pci-ip27.c index efc96ce99eeb..6002d2a6a262 100644 --- a/arch/mips/pci/pci-ip27.c +++ b/arch/mips/pci/pci-ip27.c | |||
@@ -379,18 +379,18 @@ int __init bridge_probe(nasid_t nasid, int widget_id, int masterwid) | |||
379 | bridge = (bridge_t *) RAW_NODE_SWIN_BASE(nasid, widget_id); | 379 | bridge = (bridge_t *) RAW_NODE_SWIN_BASE(nasid, widget_id); |
380 | 380 | ||
381 | /* | 381 | /* |
382 | * Clear all pending interrupts. | 382 | * Clear all pending interrupts. |
383 | */ | 383 | */ |
384 | bridge->b_int_rst_stat = BRIDGE_IRR_ALL_CLR; | 384 | bridge->b_int_rst_stat = BRIDGE_IRR_ALL_CLR; |
385 | 385 | ||
386 | /* | 386 | /* |
387 | * Until otherwise set up, assume all interrupts are from slot 0 | 387 | * Until otherwise set up, assume all interrupts are from slot 0 |
388 | */ | 388 | */ |
389 | bridge->b_int_device = 0x0; | 389 | bridge->b_int_device = 0x0; |
390 | 390 | ||
391 | /* | 391 | /* |
392 | * swap pio's to pci mem and io space (big windows) | 392 | * swap pio's to pci mem and io space (big windows) |
393 | */ | 393 | */ |
394 | bridge->b_wid_control |= BRIDGE_CTRL_IO_SWAP | | 394 | bridge->b_wid_control |= BRIDGE_CTRL_IO_SWAP | |
395 | BRIDGE_CTRL_MEM_SWAP; | 395 | BRIDGE_CTRL_MEM_SWAP; |
396 | 396 | ||