diff options
author | Linus Torvalds <torvalds@g5.osdl.org> | 2006-10-20 13:44:52 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-10-20 13:44:52 -0400 |
commit | f1877fb2967ec8c0c6e946cc24c253bb52ce4d06 (patch) | |
tree | 776d0ddf66155ac54b1f46e76f793a370da7dd2a /include/asm-mips/vr41xx/vr41xx.h | |
parent | b2ef7858db6394b758818358a43c7dd5f232bbcc (diff) | |
parent | d89e36d8df547fde2beaea82211954868da2282d (diff) |
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] Fix iounmap argument to const volatile.
[MIPS] Reserve syscall numbers for kexec_load.
[MIPS] Update tb0287_defconfig
[MIPS] Update pnx8550-v2pci_defconfig
[MIPS] Update pnx8500-jbs_defconfig
[MIPS] More vr41xx pt_regs fixups
[MIPS] save_context_stack fix
[MIPS] Use compat_sys_mount.
[MIPS] Fix O32 personality(2) call with 0xffffffff argument.
[MIPS] A few more pt_regs fixups.
[MIPS] Malta: Fix uninitialized regs pointer.
[MIPS] Delete unneeded pt_regs forward declaration.
[MIPS] Use kallsyms_lookup_size_offset() instead of kallsyms_lookup()
Diffstat (limited to 'include/asm-mips/vr41xx/vr41xx.h')
-rw-r--r-- | include/asm-mips/vr41xx/vr41xx.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/asm-mips/vr41xx/vr41xx.h b/include/asm-mips/vr41xx/vr41xx.h index dd3eb3dc5886..88b492f6ea9c 100644 --- a/include/asm-mips/vr41xx/vr41xx.h +++ b/include/asm-mips/vr41xx/vr41xx.h | |||
@@ -75,7 +75,7 @@ extern void vr41xx_mask_clock(vr41xx_clock_t clock); | |||
75 | * Interrupt Control Unit | 75 | * Interrupt Control Unit |
76 | */ | 76 | */ |
77 | extern int vr41xx_set_intassign(unsigned int irq, unsigned char intassign); | 77 | extern int vr41xx_set_intassign(unsigned int irq, unsigned char intassign); |
78 | extern int cascade_irq(unsigned int irq, int (*get_irq)(unsigned int, struct pt_regs *)); | 78 | extern int cascade_irq(unsigned int irq, int (*get_irq)(unsigned int)); |
79 | 79 | ||
80 | #define PIUINT_COMMAND 0x0040 | 80 | #define PIUINT_COMMAND 0x0040 |
81 | #define PIUINT_DATA 0x0020 | 81 | #define PIUINT_DATA 0x0020 |