Remove files now present upstream in files-2.6.25 (This is mostly just drivers/ssb...

[openwrt/openwrt.git] / target / linux / brcm47xx / patches-2.6.25 / 500-lzma_initramfs.patch

diff --git a/target/linux/brcm47xx/patches-2.6.25/500-lzma_initramfs.patch b/target/linux/brcm47xx/patches-2.6.25/500-lzma_initramfs.patch
index b545bba2641362a4b3bfa979a903f2a6bb210e92..59c1d1d754faf5ec4bea58ef0ff76fb8058e6ef0 100644 (file)
--- a/target/linux/brcm47xx/patches-2.6.25/500-lzma_initramfs.patch
+++ b/target/linux/brcm47xx/patches-2.6.25/500-lzma_initramfs.patch
@@ -1,8 +1,8 @@
-Index: linux-2.6.23.1/scripts/gen_initramfs_list.sh
+Index: linux-2.6.25/scripts/gen_initramfs_list.sh
 ===================================================================
---- linux-2.6.23.1.orig/scripts/gen_initramfs_list.sh  2007-11-16 02:26:47.821227881 +0100
-+++ linux-2.6.23.1/scripts/gen_initramfs_list.sh       2007-11-16 02:45:42.753904007 +0100
-@@ -287,7 +287,7 @@
+--- linux-2.6.25.orig/scripts/gen_initramfs_list.sh    2008-04-26 21:57:00.000000000 +0100
++++ linux-2.6.25/scripts/gen_initramfs_list.sh 2008-04-26 21:57:20.000000000 +0100
+@@ -287,7 +287,7 @@ if [ ! -z ${output_file} ]; then
        if [ "${is_cpio_compressed}" = "compressed" ]; then
                cat ${cpio_tfile} > ${output_file}
        else
@@ -11,11 +11,11 @@ Index: linux-2.6.23.1/scripts/gen_initramfs_list.sh
        fi
        [ -z ${cpio_file} ] && rm ${cpio_tfile}
  fi
-Index: linux-2.6.23.1/init/initramfs.c
+Index: linux-2.6.25/init/initramfs.c
 ===================================================================
---- linux-2.6.23.1.orig/init/initramfs.c       2007-11-16 02:26:47.829228332 +0100
-+++ linux-2.6.23.1/init/initramfs.c    2007-11-16 03:03:09.661563882 +0100
-@@ -441,6 +441,69 @@
+--- linux-2.6.25.orig/init/initramfs.c 2008-04-26 21:56:21.000000000 +0100
++++ linux-2.6.25/init/initramfs.c      2008-04-26 21:57:20.000000000 +0100
+@@ -441,6 +441,69 @@ static void __init flush_window(void)
        outcnt = 0;
  }
  
@@ -85,7 +85,7 @@ Index: linux-2.6.23.1/init/initramfs.c
  static char * __init unpack_to_rootfs(char *buf, unsigned len, int check_only)
  {
        int written;
-@@ -475,12 +538,28 @@
+@@ -475,12 +538,28 @@ static char * __init unpack_to_rootfs(ch
                inptr = 0;
                outcnt = 0;             /* bytes in output buffer */
                bytes_out = 0;