diff options
| author | Linus Torvalds <torvalds@g5.osdl.org> | 2006-01-10 12:00:55 -0500 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-01-10 12:00:55 -0500 |
| commit | d936cfc72032fb4af03d1edd99596d18ea1f081c (patch) | |
| tree | 6d524c57fbff717ba82c6f4925659f6ec901d45d /arch/mips/vr41xx/common/int-handler.S | |
| parent | 4f47707b056bd2e3627ef390557ee93d312daba5 (diff) | |
| parent | adfc76419bff33542d4fd53dc7f24818f846f194 (diff) | |
Merge branch 'upstream' of git://ftp.linux-mips.org/pub/scm/upstream-linus
Diffstat (limited to 'arch/mips/vr41xx/common/int-handler.S')
| -rw-r--r-- | arch/mips/vr41xx/common/int-handler.S | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/mips/vr41xx/common/int-handler.S b/arch/mips/vr41xx/common/int-handler.S index 272c13aee4f..2b6043f16d0 100644 --- a/arch/mips/vr41xx/common/int-handler.S +++ b/arch/mips/vr41xx/common/int-handler.S | |||
| @@ -35,7 +35,7 @@ | |||
| 35 | * MontaVista Software Inc. <yyuasa@mvista.com> or <source@mvista.com> | 35 | * MontaVista Software Inc. <yyuasa@mvista.com> or <source@mvista.com> |
| 36 | * - New creation, NEC VR4100 series are supported. | 36 | * - New creation, NEC VR4100 series are supported. |
| 37 | * | 37 | * |
| 38 | * Yoichi Yuasa <yuasa@hh.iij4u.or.jp> | 38 | * Yoichi Yuasa <yoichi_yuasa@tripeaks.co.jp> |
| 39 | * - Coped with INTASSIGN of NEC VR4133. | 39 | * - Coped with INTASSIGN of NEC VR4133. |
| 40 | */ | 40 | */ |
| 41 | #include <asm/asm.h> | 41 | #include <asm/asm.h> |