diff options
| author | Grant Likely <grant.likely@linaro.org> | 2015-06-30 13:28:52 (GMT) |
|---|---|---|
| committer | Grant Likely <grant.likely@linaro.org> | 2015-06-30 13:28:52 (GMT) |
| commit | becfc3c86df963491ff1d5ffc6131a06af6bb851 (patch) | |
| tree | 4b60fb962445166025724b84ce13e7f1762df8a1 /arch/mips | |
| parent | ce32f859646bab2ed724393398b90aa50149bb44 (diff) | |
| parent | 0b34c1a489f6f018c4fbfbd12657acaa0b4f4ca9 (diff) | |
| download | linux-becfc3c86df963491ff1d5ffc6131a06af6bb851.tar.xz | |
Merge remote-tracking branch 'robh/for-next' into devicetree/next
Diffstat (limited to 'arch/mips')
| -rw-r--r-- | arch/mips/cavium-octeon/Makefile | 3 | ||||
| -rw-r--r-- | arch/mips/include/asm/prom.h | 2 | ||||
| -rw-r--r-- | arch/mips/kernel/prom.c | 1 | ||||
| -rw-r--r-- | arch/mips/mti-sead3/Makefile | 2 |
4 files changed, 2 insertions, 6 deletions
diff --git a/arch/mips/cavium-octeon/Makefile b/arch/mips/cavium-octeon/Makefile index 69a8a8d..2a59265 100644 --- a/arch/mips/cavium-octeon/Makefile +++ b/arch/mips/cavium-octeon/Makefile @@ -9,9 +9,6 @@ # Copyright (C) 2005-2009 Cavium Networks # -CFLAGS_octeon-platform.o = -I$(src)/../../../scripts/dtc/libfdt -CFLAGS_setup.o = -I$(src)/../../../scripts/dtc/libfdt - obj-y := cpu.o setup.o octeon-platform.o octeon-irq.o csrc-octeon.o obj-y += dma-octeon.o obj-y += octeon-memcpy.o diff --git a/arch/mips/include/asm/prom.h b/arch/mips/include/asm/prom.h index 8ebc2aa..0b4b668 100644 --- a/arch/mips/include/asm/prom.h +++ b/arch/mips/include/asm/prom.h @@ -11,7 +11,7 @@ #ifndef __ASM_PROM_H #define __ASM_PROM_H -#ifdef CONFIG_OF +#ifdef CONFIG_USE_OF #include <linux/bug.h> #include <linux/io.h> #include <linux/types.h> diff --git a/arch/mips/kernel/prom.c b/arch/mips/kernel/prom.c index e303cb1..b130033 100644 --- a/arch/mips/kernel/prom.c +++ b/arch/mips/kernel/prom.c @@ -18,6 +18,7 @@ #include <linux/of_fdt.h> #include <linux/of_platform.h> +#include <asm/bootinfo.h> #include <asm/page.h> #include <asm/prom.h> diff --git a/arch/mips/mti-sead3/Makefile b/arch/mips/mti-sead3/Makefile index ecd71db..2e52cbd 100644 --- a/arch/mips/mti-sead3/Makefile +++ b/arch/mips/mti-sead3/Makefile @@ -15,5 +15,3 @@ obj-y := sead3-lcd.o sead3-display.o sead3-init.o \ obj-y += leds-sead3.o obj-$(CONFIG_EARLY_PRINTK) += sead3-console.o - -CFLAGS_sead3-setup.o = -I$(src)/../../../scripts/dtc/libfdt |