X-Git-Url: http://git.rohieb.name/openwrt.git/blobdiff_plain/237a39ca53c942746b4a65cde88faa57146a75e6..3713dae2c6c9de7930a90b9c317a31dba2c9d716:/target/linux/brcm-2.6/patches/001-bcm947xx.patch

diff --git a/target/linux/brcm-2.6/patches/001-bcm947xx.patch b/target/linux/brcm-2.6/patches/001-bcm947xx.patch
index 771ea71b7..a0820d0cd 100644
--- a/target/linux/brcm-2.6/patches/001-bcm947xx.patch
+++ b/target/linux/brcm-2.6/patches/001-bcm947xx.patch
@@ -11807,7 +11807,7 @@ diff -Nur linux-2.6.16/arch/mips/kernel/cpu-probe.c linux-2.6.16-owrt/arch/mips/
 diff -Nur linux-2.6.16/arch/mips/kernel/head.S linux-2.6.16-owrt/arch/mips/kernel/head.S
 --- linux-2.6.16/arch/mips/kernel/head.S	2006-03-20 06:53:29.000000000 +0100
 +++ linux-2.6.16-owrt/arch/mips/kernel/head.S	2006-03-21 09:31:00.000000000 +0100
-@@ -107,6 +107,14 @@
+@@ -107,6 +107,11 @@
  #endif
  	.endm
  
@@ -11815,9 +11815,6 @@ diff -Nur linux-2.6.16/arch/mips/kernel/head.S linux-2.6.16-owrt/arch/mips/kerne
 +#undef eret
 +#define eret nop; nop; eret
 +#endif
-+
-+	j	kernel_entry
-+	nop
 +
  	/*
  	 * Reserved space for exception handlers.
@@ -11907,18 +11904,6 @@ diff -Nur linux-2.6.16/include/asm-mips/cpu.h linux-2.6.16-owrt/include/asm-mips
  
  /*
   * ISA Level encodings
-diff -Nur linux-2.6.16/include/linux/init.h linux-2.6.16-owrt/include/linux/init.h
---- linux-2.6.16/include/linux/init.h	2006-03-20 06:53:29.000000000 +0100
-+++ linux-2.6.16-owrt/include/linux/init.h	2006-03-21 09:31:00.000000000 +0100
-@@ -86,6 +86,8 @@
- 	static initcall_t __initcall_##fn __attribute_used__ \
- 	__attribute__((__section__(".initcall" level ".init"))) = fn
- 
-+#define early_initcall(fn)		__define_initcall(".early1",fn)
-+
- #define core_initcall(fn)		__define_initcall("1",fn)
- #define postcore_initcall(fn)		__define_initcall("2",fn)
- #define arch_initcall(fn)		__define_initcall("3",fn)
 diff -Nur linux-2.6.16/include/linux/pci_ids.h linux-2.6.16-owrt/include/linux/pci_ids.h
 --- linux-2.6.16/include/linux/pci_ids.h	2006-03-20 06:53:29.000000000 +0100
 +++ linux-2.6.16-owrt/include/linux/pci_ids.h	2006-03-21 09:31:00.000000000 +0100