diff options
| author | Grant Likely <grant.likely@linaro.org> | 2015-06-30 14:28:52 +0100 |
|---|---|---|
| committer | Grant Likely <grant.likely@linaro.org> | 2015-06-30 14:28:52 +0100 |
| commit | becfc3c86df963491ff1d5ffc6131a06af6bb851 (patch) | |
| tree | 4b60fb962445166025724b84ce13e7f1762df8a1 /arch/powerpc/kernel | |
| parent | ce32f859646bab2ed724393398b90aa50149bb44 (diff) | |
| parent | 0b34c1a489f6f018c4fbfbd12657acaa0b4f4ca9 (diff) | |
| download | op-kernel-dev-becfc3c86df963491ff1d5ffc6131a06af6bb851.zip op-kernel-dev-becfc3c86df963491ff1d5ffc6131a06af6bb851.tar.gz | |
Merge remote-tracking branch 'robh/for-next' into devicetree/next
Diffstat (limited to 'arch/powerpc/kernel')
| -rw-r--r-- | arch/powerpc/kernel/Makefile | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/arch/powerpc/kernel/Makefile b/arch/powerpc/kernel/Makefile index c1ebbda..c16e836 100644 --- a/arch/powerpc/kernel/Makefile +++ b/arch/powerpc/kernel/Makefile @@ -2,7 +2,6 @@ # Makefile for the linux kernel. # -CFLAGS_prom.o = -I$(src)/../../../scripts/dtc/libfdt CFLAGS_ptrace.o += -DUTS_MACHINE='"$(UTS_MACHINE)"' subdir-ccflags-$(CONFIG_PPC_WERROR) := -Werror |
