diff options
| author | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-06-20 14:40:52 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-06-20 14:40:52 -0700 |
| commit | 044f620ac65d0d90727cdbd0c058e4d150d62ddc (patch) | |
| tree | 89bcf2829803979ff8384d14c159daebabc3244d /drivers | |
| parent | c53ab5d56c66816fe06dc6cd0abb93f6dd81a145 (diff) | |
| parent | 3b1d4ed5353af04d6aa20be2701727b9cdb2ac61 (diff) | |
| download | linux-3.10-044f620ac65d0d90727cdbd0c058e4d150d62ddc.tar.gz linux-3.10-044f620ac65d0d90727cdbd0c058e4d150d62ddc.tar.bz2 linux-3.10-044f620ac65d0d90727cdbd0c058e4d150d62ddc.zip | |
Merge branch 'upstream' of git://ftp.linux-mips.org/pub/scm/upstream-linus
* 'upstream' of git://ftp.linux-mips.org/pub/scm/upstream-linus:
[MIPS] Don't drag a platform specific header into generic arch code.
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/net/mipsnet.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/mipsnet.c b/drivers/net/mipsnet.c index 638a279ec50..9853c74f6bb 100644 --- a/drivers/net/mipsnet.c +++ b/drivers/net/mipsnet.c @@ -240,7 +240,7 @@ static int __init mipsnet_probe(struct device *dev) * TODO: probe for these or load them from PARAM */ netdev->base_addr = 0x4200; - netdev->irq = MIPSCPU_INT_BASE + MIPSCPU_INT_MB0 + + netdev->irq = MIPS_CPU_IRQ_BASE + MIPSCPU_INT_MB0 + inl(mipsnet_reg_address(netdev, interruptInfo)); // Get the io region now, get irq on open() |