Merge branch 'upstream' of git://git.linux-mips.org/pub/scm/ralf/upstream-linus

Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git

kernel os linux

Pull MIPS fixes from Ralf Baechle:
"This fixes two build issues for ralink platforms, both due to missing
#includes which used to be included indirectly via other headers"

* 'upstream' of git://git.linux-mips.org/pub/scm/ralf/upstream-linus:
MIPS: ralink: mt7620: Add missing header
MIPS: ralink: Fix build error due to missing header

Linus Torvalds 8 years ago 6ea1bc9b fbb77611

2 changed files

expand all

arch

mips

include

asm

mach-ralink

ralink_regs.h

ralink

mt7620.c

arch/mips/include/asm/mach-ralink/ralink_regs.h

··· 13 13 #ifndef _RALINK_REGS_H_ 14 14 #define _RALINK_REGS_H_ 15 15 16 + #include <linux/io.h> 17 + 16 18 enum ralink_soc_type { 17 19 RALINK_UNKNOWN = 0, 18 20 RT2880_SOC,

arch/mips/ralink/mt7620.c

··· 12 12 13 13 #include <linux/kernel.h> 14 14 #include <linux/init.h> 15 + #include <linux/bug.h> 15 16 16 17 #include <asm/mipsregs.h> 17 18 #include <asm/mach-ralink/ralink_regs.h>

Configure Feed

Configure Feed