[cavium-octeon] update to 2.6.30-rc5

[openwrt.git] / target / linux / generic-2.6 / patches-2.6.27 / 951-revert_gcc4_4_fixes.patch

diff --git a/target/linux/generic-2.6/patches-2.6.27/951-revert_gcc4_4_fixes.patch b/target/linux/generic-2.6/patches-2.6.27/951-revert_gcc4_4_fixes.patch
index 271f01d..1f1800f 100644 (file)
--- a/target/linux/generic-2.6/patches-2.6.27/951-revert_gcc4_4_fixes.patch
+++ b/target/linux/generic-2.6/patches-2.6.27/951-revert_gcc4_4_fixes.patch
@@ -236,7 +236,7 @@
 -#endif
 --- a/arch/powerpc/boot/Makefile
 +++ b/arch/powerpc/boot/Makefile
 -#endif
 --- a/arch/powerpc/boot/Makefile
 +++ b/arch/powerpc/boot/Makefile

-@@ -53,7 +53,7 @@
+@@ -53,7 +53,7 @@ $(addprefix $(obj)/,$(zlib) cuboot-c2k.o

        $(addprefix $(obj)/,$(zliblinuxheader)) $(addprefix $(obj)/,$(zlibheader))
  
  src-libfdt := fdt.c fdt_ro.c fdt_wip.c fdt_sw.c fdt_rw.c fdt_strerror.c
        $(addprefix $(obj)/,$(zliblinuxheader)) $(addprefix $(obj)/,$(zlibheader))
  
  src-libfdt := fdt.c fdt_ro.c fdt_wip.c fdt_sw.c fdt_rw.c fdt_strerror.c


@@ -247,7 +247,7 @@
                gunzip_util.c elf_util.c $(zlib) devtree.c oflib.c ofconsole.c \
 --- a/arch/powerpc/kernel/prom_init_check.sh
 +++ b/arch/powerpc/kernel/prom_init_check.sh
                gunzip_util.c elf_util.c $(zlib) devtree.c oflib.c ofconsole.c \
 --- a/arch/powerpc/kernel/prom_init_check.sh
 +++ b/arch/powerpc/kernel/prom_init_check.sh

-@@ -48,20 +48,6 @@
+@@ -48,20 +48,6 @@ do

                fi
        done
  
                fi
        done
  


@@ -502,7 +502,7 @@
 -#endif
 --- a/arch/powerpc/lib/Makefile
 +++ b/arch/powerpc/lib/Makefile
 -#endif
 --- a/arch/powerpc/lib/Makefile
 +++ b/arch/powerpc/lib/Makefile

-@@ -8,7 +8,7 @@
+@@ -8,7 +8,7 @@ endif

  
  obj-y                 := string.o alloc.o \
                           checksum_$(CONFIG_WORD_SIZE).o
  
  obj-y                 := string.o alloc.o \
                           checksum_$(CONFIG_WORD_SIZE).o


@@ -513,7 +513,7 @@
  obj-$(CONFIG_PPC64)   += copypage_64.o copyuser_64.o \
 --- a/arch/powerpc/Makefile
 +++ b/arch/powerpc/Makefile
  obj-$(CONFIG_PPC64)   += copypage_64.o copyuser_64.o \
 --- a/arch/powerpc/Makefile
 +++ b/arch/powerpc/Makefile

-@@ -90,8 +90,6 @@
+@@ -90,8 +90,6 @@ endif

  else
        KBUILD_CFLAGS += $(call cc-option,-mtune=power4)
  endif
  else
        KBUILD_CFLAGS += $(call cc-option,-mtune=power4)
  endif