diff options
| author | J. Bruce Fields <bfields@citi.umich.edu> | 2010-03-04 12:03:16 -0500 |
|---|---|---|
| committer | J. Bruce Fields <bfields@citi.umich.edu> | 2010-03-04 12:04:51 -0500 |
| commit | 4ea41e2de5bba756858bb40f964e3490b6d1a25c (patch) | |
| tree | 51a688be321dd42f80d8a0c966eb6a60408d50b3 /arch/mips/sni/rm200.c | |
| parent | 8d75da8afd068fa58b35e69c7c8c46770d9e7a98 (diff) | |
| parent | 398007f863a4af2b4a5a07219c5a617f1a098115 (diff) | |
Merge branch 'for-linus' of git://oss.sgi.com/xfs/xfs into for-2.6.34-incoming
Resolve merge conflict in fs/xfs/linux-2.6/xfs_export.c.
Diffstat (limited to 'arch/mips/sni/rm200.c')
| -rw-r--r-- | arch/mips/sni/rm200.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/mips/sni/rm200.c b/arch/mips/sni/rm200.c index 46f00691f448..31e2583ec622 100644 --- a/arch/mips/sni/rm200.c +++ b/arch/mips/sni/rm200.c | |||
| @@ -404,7 +404,7 @@ void __init sni_rm200_i8259_irqs(void) | |||
| 404 | if (!rm200_pic_master) | 404 | if (!rm200_pic_master) |
| 405 | return; | 405 | return; |
| 406 | rm200_pic_slave = ioremap_nocache(0x160000a0, 4); | 406 | rm200_pic_slave = ioremap_nocache(0x160000a0, 4); |
| 407 | if (!rm200_pic_master) { | 407 | if (!rm200_pic_slave) { |
| 408 | iounmap(rm200_pic_master); | 408 | iounmap(rm200_pic_master); |
| 409 | return; | 409 | return; |
| 410 | } | 410 | } |