[kernel] fix gpiommc driver on 2.6.26 (closes #4129)

[openwrt.git] / target / linux / brcm63xx / patches-2.6.25 / 090-bcm963xx_remove_obsolete_timer_code.patch

diff --git a/target/linux/brcm63xx/patches-2.6.25/090-bcm963xx_remove_obsolete_timer_code.patch b/target/linux/brcm63xx/patches-2.6.25/090-bcm963xx_remove_obsolete_timer_code.patch
index 9a81e00..72ccfea 100644 (file)
--- a/target/linux/brcm63xx/patches-2.6.25/090-bcm963xx_remove_obsolete_timer_code.patch
+++ b/target/linux/brcm63xx/patches-2.6.25/090-bcm963xx_remove_obsolete_timer_code.patch
@@ -11,11 +11,9 @@ Signed-off-by: Axel Gembe <ago@bastart.eu.org>
  arch/mips/bcm963xx/time.c  |   29 -----------------------------
  2 files changed, 0 insertions(+), 31 deletions(-)
 
-diff --git a/arch/mips/bcm963xx/setup.c b/arch/mips/bcm963xx/setup.c
-index 5847278..982cba0 100644
 --- a/arch/mips/bcm963xx/setup.c
 +++ b/arch/mips/bcm963xx/setup.c
-@@ -465,8 +465,6 @@ void __init plat_mem_setup(void)
+@@ -465,8 +465,6 @@
        _machine_halt = brcm_machine_halt;
        pm_power_off = brcm_machine_halt;
  
@@ -24,11 +22,9 @@ index 5847278..982cba0 100644
        /* mpi initialization */
        mpi_init();
  }
-diff --git a/arch/mips/bcm963xx/time.c b/arch/mips/bcm963xx/time.c
-index fa0fa71..8a5007e 100644
 --- a/arch/mips/bcm963xx/time.c
 +++ b/arch/mips/bcm963xx/time.c
-@@ -71,26 +71,6 @@ static inline unsigned long __init cal_r4koff(void)
+@@ -71,26 +71,6 @@
        return (mips_hpt_frequency / HZ);
  }
  
@@ -55,7 +51,7 @@ index fa0fa71..8a5007e 100644
  void __init plat_time_init(void)
  {
        unsigned int est_freq, flags;
-@@ -107,12 +87,3 @@ void __init plat_time_init(void)
+@@ -107,12 +87,3 @@
                   (est_freq % 1000000) * 100 / 1000000);
        local_irq_restore(flags);
  }
@@ -68,6 +64,3 @@ index fa0fa71..8a5007e 100644
 -      set_c0_status(IE_IRQ5);
 -}
 -#endif
--- 
-1.5.5.1
-