upgrade to 2.6.25.7, and refresh patches

[openwrt/staging/chunkeey.git] / target / linux / brcm63xx / patches-2.6.25 / 110-bcm963xx_fix_cfe_detection.patch

diff --git a/target/linux/brcm63xx/patches-2.6.25/110-bcm963xx_fix_cfe_detection.patch b/target/linux/brcm63xx/patches-2.6.25/110-bcm963xx_fix_cfe_detection.patch
index e22f22126ff01f56eb7e68c37aaf8744dd3bff3c..3cf46026661cc3316e857d2aa088f631abb41e0d 100644 (file)
--- a/target/linux/brcm63xx/patches-2.6.25/110-bcm963xx_fix_cfe_detection.patch
+++ b/target/linux/brcm63xx/patches-2.6.25/110-bcm963xx_fix_cfe_detection.patch
@@ -10,10 +10,8 @@ Signed-off-by: Axel Gembe <ago@bastart.eu.org>
  drivers/mtd/maps/bcm963xx-flash.c |   11 ++++++-----
  1 files changed, 6 insertions(+), 5 deletions(-)
 
-Index: linux-2.6.25.4/drivers/mtd/maps/bcm963xx-flash.c
-===================================================================
---- linux-2.6.25.4.orig/drivers/mtd/maps/bcm963xx-flash.c
-+++ linux-2.6.25.4/drivers/mtd/maps/bcm963xx-flash.c
+--- a/drivers/mtd/maps/bcm963xx-flash.c
++++ b/drivers/mtd/maps/bcm963xx-flash.c
 @@ -1,8 +1,7 @@
  /*
 - * $Id$
@@ -25,7 +23,7 @@ Index: linux-2.6.25.4/drivers/mtd/maps/bcm963xx-flash.c
   *
   * This program is free software; you can redistribute it and/or modify
   * it under the terms of the GNU General Public License as published by
-@@ -184,11 +183,13 @@ static int bcm963xx_parts_size = sizeof(
+@@ -184,11 +183,13 @@
  static int bcm963xx_detect_cfe(struct mtd_info *master)
  {
         int idoffset = 0x4e0;