summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2017-08-06 11:52:01 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2017-08-06 11:52:01 -0700
commit6ea1bc9b1a05891b5ab02ac516abc6dfc00fe22c (patch)
treebdca54f356ed8ab6edd5958e95e03e4609ca6b5a
parentfbb77611e95d3d5b2af86a59754a3130877cb667 (diff)
parentf13343e87713959437a4a50a730de1736f23fc20 (diff)
downloadop-kernel-dev-6ea1bc9b1a05891b5ab02ac516abc6dfc00fe22c.zip
op-kernel-dev-6ea1bc9b1a05891b5ab02ac516abc6dfc00fe22c.tar.gz
Merge branch 'upstream' of git://git.linux-mips.org/pub/scm/ralf/upstream-linus
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
-rw-r--r--arch/mips/include/asm/mach-ralink/ralink_regs.h2
-rw-r--r--arch/mips/ralink/mt7620.c1
2 files changed, 3 insertions, 0 deletions
diff --git a/arch/mips/include/asm/mach-ralink/ralink_regs.h b/arch/mips/include/asm/mach-ralink/ralink_regs.h
index 9df1a53..b4e7dfa 100644
--- a/arch/mips/include/asm/mach-ralink/ralink_regs.h
+++ b/arch/mips/include/asm/mach-ralink/ralink_regs.h
@@ -13,6 +13,8 @@
#ifndef _RALINK_REGS_H_
#define _RALINK_REGS_H_
+#include <linux/io.h>
+
enum ralink_soc_type {
RALINK_UNKNOWN = 0,
RT2880_SOC,
diff --git a/arch/mips/ralink/mt7620.c b/arch/mips/ralink/mt7620.c
index 094a0ee..9be8b08 100644
--- a/arch/mips/ralink/mt7620.c
+++ b/arch/mips/ralink/mt7620.c
@@ -12,6 +12,7 @@
#include <linux/kernel.h>
#include <linux/init.h>
+#include <linux/bug.h>
#include <asm/mipsregs.h>
#include <asm/mach-ralink/ralink_regs.h>
OpenPOWER on IntegriCloud