[kernel] generic-2.6/2.6.30: resync patches for 2.6.30-rc5

[openwrt/svn-archive/archive.git] / target / linux / generic-2.6 / patches-2.6.30 / 951-revert_gcc4_4_fixes.patch

diff --git a/target/linux/generic-2.6/patches-2.6.30/951-revert_gcc4_4_fixes.patch b/target/linux/generic-2.6/patches-2.6.30/951-revert_gcc4_4_fixes.patch
index 2202de10cb24c789f192eae08f02d4b6d7b3a2ba..26265ab323e4eea4376478c495d8441081788d94 100644 (file)
--- a/target/linux/generic-2.6/patches-2.6.30/951-revert_gcc4_4_fixes.patch
+++ b/target/linux/generic-2.6/patches-2.6.30/951-revert_gcc4_4_fixes.patch
@@ -236,13 +236,13 @@
 -#endif
 --- a/arch/powerpc/boot/Makefile
 +++ b/arch/powerpc/boot/Makefile
-@@ -54,7 +54,7 @@ $(addprefix $(obj)/,$(zlib) cuboot-c2k.o
-       $(addprefix $(obj)/,$(zliblinuxheader)) $(addprefix $(obj)/,$(zlibheader))
+@@ -59,7 +59,7 @@ libfdtheader := fdt.h libfdt.h libfdt_in
+ $(addprefix $(obj)/,$(libfdt) libfdt-wrapper.o simpleboot.o): \
+       $(addprefix $(obj)/,$(libfdtheader))
  
- src-libfdt := fdt.c fdt_ro.c fdt_wip.c fdt_sw.c fdt_rw.c fdt_strerror.c
 -src-wlib := string.S crt0.S crtsavres.S stdio.c main.c \
 +src-wlib := string.S crt0.S stdio.c main.c \
-               $(addprefix libfdt/,$(src-libfdt)) libfdt-wrapper.c \
+               $(libfdt) libfdt-wrapper.c \
                ns16550.c serial.c simple_alloc.c div64.S util.S \
                gunzip_util.c elf_util.c $(zlib) devtree.c oflib.c ofconsole.c \
 --- a/arch/powerpc/kernel/prom_init_check.sh