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: PowerTV: Fix support for timer interrupts with > 64 external IRQs MIPS: PowerTV: Streamline access to platform device registers MIPS: Fix vmlinuz build for 32bit-only math shells MIPS: Add support of LZO-compressed kernels
Showing
- arch/mips/Kconfig 1 addition, 0 deletionsarch/mips/Kconfig
- arch/mips/boot/compressed/Makefile 7 additions, 2 deletionsarch/mips/boot/compressed/Makefile
- arch/mips/boot/compressed/decompress.c 4 additions, 0 deletionsarch/mips/boot/compressed/decompress.c
- arch/mips/include/asm/irq.h 1 addition, 0 deletionsarch/mips/include/asm/irq.h
- arch/mips/include/asm/mach-powertv/asic_reg_map.h 90 additions, 0 deletionsarch/mips/include/asm/mach-powertv/asic_reg_map.h
- arch/mips/include/asm/mach-powertv/asic_regs.h 51 additions, 84 deletionsarch/mips/include/asm/mach-powertv/asic_regs.h
- arch/mips/include/asm/mipsregs.h 12 additions, 0 deletionsarch/mips/include/asm/mipsregs.h
- arch/mips/kernel/cevt-r4k.c 1 addition, 1 deletionarch/mips/kernel/cevt-r4k.c
- arch/mips/kernel/traps.c 4 additions, 2 deletionsarch/mips/kernel/traps.c
- arch/mips/powertv/asic/asic-calliope.c 67 additions, 64 deletionsarch/mips/powertv/asic/asic-calliope.c
- arch/mips/powertv/asic/asic-cronus.c 67 additions, 64 deletionsarch/mips/powertv/asic/asic-cronus.c
- arch/mips/powertv/asic/asic-zeus.c 67 additions, 64 deletionsarch/mips/powertv/asic/asic-zeus.c
- arch/mips/powertv/asic/asic_devices.c 19 additions, 27 deletionsarch/mips/powertv/asic/asic_devices.c
Please register or sign in to comment