Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 61ce7b3a authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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] Cleanup unnecessary <asm/ptrace.h> inclusions.
  [MIPS] DEC: pt_regs fixes for buserror handlers
  [MIPS] Fix return type of gt64120_irq.
  [MIPS] Ocelot C: Build fix - ll_mv64340_irq takes no more regs argument.
  [MIPS] Jazz defconfig file.
  [MIPS] Jazz: build fix - include <linux/screen_info.h>
  [MIPS] Jazz: Remove warning.  After 7 years probably somebody test this ;)
  [MIPS] Jazz: Fix I/O port resources.
  [MIPS] DEC: pt_regs fixes for dec_intr_halt.
  handle_sysrq lost its pt_regs * argument

Manual conflict resolved in arch/um/drivers/mconsole_kern.c
parents 7bea96fd 27f76819

arch/mips/au1000/common/time.c

+0 −1
Original line number Diff line number Diff line
@@ -41,7 +41,6 @@ 


#include <asm/compiler.h>

#include <asm/mipsregs.h>

#include <asm/ptrace.h>

#include <asm/time.h>

#include <asm/div64.h>

#include <asm/mach-au1x00/au1000.h>

arch/mips/cobalt/irq.c

+0 −1
Original line number Diff line number Diff line
@@ -16,7 +16,6 @@ 
#include <asm/i8259.h>

#include <asm/irq_cpu.h>

#include <asm/gt64120.h>

#include <asm/ptrace.h>



#include <asm/mach-cobalt/cobalt.h>