1 files changed, 12 insertions, 20 deletions
diff --git a/target/linux/brcm63xx/patches-2.6.25/500-bcm96345_fixes.patch b/target/linux/brcm63xx/patches-2.6.25/500-bcm96345_fixes.patch
index 1f8dd96..dd55cd1 100644
--- a/target/linux/brcm63xx/patches-2.6.25/500-bcm96345_fixes.patch
+++ b/target/linux/brcm63xx/patches-2.6.25/500-bcm96345_fixes.patch
@@ -17,10 +17,8 @@ Signed-off-by: Axel Gembe <ago@bastart.eu.org>
  include/asm-mips/mach-bcm963xx/board.h |    2 ++
  4 files changed, 25 insertions(+), 11 deletions(-)
 
-Index: linux-2.6.25.4/arch/mips/bcm963xx/setup.c
-===================================================================
---- linux-2.6.25.4.orig/arch/mips/bcm963xx/setup.c
-+++ linux-2.6.25.4/arch/mips/bcm963xx/setup.c
+--- a/arch/mips/bcm963xx/setup.c
++++ b/arch/mips/bcm963xx/setup.c
 @@ -43,6 +43,7 @@
  #include <asm/bootinfo.h>
  #include <asm/cpu.h>
@@ -29,7 +27,7 @@ Index: linux-2.6.25.4/arch/mips/bcm963xx/setup.c
  
  extern void brcm_time_init(void);
  extern int boot_loader_type;
-@@ -465,6 +466,9 @@ void __init plat_mem_setup(void)
+@@ -465,6 +466,9 @@
  	_machine_halt = brcm_machine_halt;
  	pm_power_off = brcm_machine_halt;
  
@@ -41,10 +39,8 @@ Index: linux-2.6.25.4/arch/mips/bcm963xx/setup.c
 +		mpi_init();
 +	}
  }
-Index: linux-2.6.25.4/arch/mips/bcm963xx/time.c
-===================================================================
---- linux-2.6.25.4.orig/arch/mips/bcm963xx/time.c
-+++ linux-2.6.25.4/arch/mips/bcm963xx/time.c
+--- a/arch/mips/bcm963xx/time.c
++++ b/arch/mips/bcm963xx/time.c
 @@ -40,6 +40,8 @@
  #include <6348_intr.h>
  #include <bcm_map_part.h>
@@ -54,7 +50,7 @@ Index: linux-2.6.25.4/arch/mips/bcm963xx/time.c
  
  /*
   * calculateCpuSpeed()
-@@ -63,11 +65,12 @@ static inline unsigned long __init calcu
+@@ -63,11 +65,12 @@
  }
  
  
@@ -68,10 +64,8 @@ Index: linux-2.6.25.4/arch/mips/bcm963xx/time.c
  
  	printk("CPU frequency %lu.%02lu MHz\n", cpu_clock / 1000000,
  		(cpu_clock % 1000000) * 100 / 1000000);
-Index: linux-2.6.25.4/arch/mips/pci/pci-bcm96348.c
-===================================================================
---- linux-2.6.25.4.orig/arch/mips/pci/pci-bcm96348.c
-+++ linux-2.6.25.4/arch/mips/pci/pci-bcm96348.c
+--- a/arch/mips/pci/pci-bcm96348.c
++++ b/arch/mips/pci/pci-bcm96348.c
 @@ -21,6 +21,8 @@
  #include <linux/kernel.h>
  #include <linux/init.h>
@@ -81,7 +75,7 @@ Index: linux-2.6.25.4/arch/mips/pci/pci-bcm96348.c
  #include <bcmpci.h>
  
  static struct resource bcm_pci_io_resource = {
-@@ -47,16 +49,19 @@ struct pci_controller bcm96348_controlle
+@@ -47,16 +49,19 @@
  
  static __init int bcm96348_pci_init(void)
  {
@@ -110,11 +104,9 @@ Index: linux-2.6.25.4/arch/mips/pci/pci-bcm96348.c
  }
  
  arch_initcall(bcm96348_pci_init);
-Index: linux-2.6.25.4/include/asm-mips/mach-bcm963xx/board.h
-===================================================================
---- linux-2.6.25.4.orig/include/asm-mips/mach-bcm963xx/board.h
-+++ linux-2.6.25.4/include/asm-mips/mach-bcm963xx/board.h
-@@ -369,5 +369,7 @@ void kerSysWakeupMonitorTask( void );
+--- a/include/asm-mips/mach-bcm963xx/board.h
++++ b/include/asm-mips/mach-bcm963xx/board.h
+@@ -369,5 +369,7 @@
  
  extern int boot_loader_type;