Makefile.rej should not be there. That was introduced in commit 3fa68afc3d774bab1e91cbb3a3cdd1e36068ee95 .
Signed-off-by: Tracey Dent <tdent48...@gmail.com> --- arch/mips/lantiq/xway/Makefile.rej | 5 ----- 1 file changed, 5 deletions(-) delete mode 100644 arch/mips/lantiq/xway/Makefile.rej diff --git a/arch/mips/lantiq/xway/Makefile.rej b/arch/mips/lantiq/xway/Makefile.rej deleted file mode 100644 index 8066520..0000000 --- a/arch/mips/lantiq/xway/Makefile.rej +++ /dev/null @@ -1,5 +0,0 @@ ---- arch/mips/lantiq/xway/Makefile -+++ arch/mips/lantiq/xway/Makefile -@@ -1 +1 @@ --obj-y := prom.o sysctrl.o clk.o reset.o gpio.o dma.o -+obj-y := prom.o sysctrl.o clk.o reset.o dma.o -- 1.7.10.rc4 -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
