[octeon] resync kernel configuration

[openwrt.git] / target / linux / generic-2.6 / patches-2.6.25 / 010-disable_old_squashfs_compatibility.patch

diff --git a/target/linux/generic-2.6/patches-2.6.25/010-disable_old_squashfs_compatibility.patch b/target/linux/generic-2.6/patches-2.6.25/010-disable_old_squashfs_compatibility.patch
index ecc7436..01e2757 100644 (file)
--- a/target/linux/generic-2.6/patches-2.6.25/010-disable_old_squashfs_compatibility.patch
+++ b/target/linux/generic-2.6/patches-2.6.25/010-disable_old_squashfs_compatibility.patch
@@ -1,16 +1,12 @@
-Index: linux-2.6.25.1/fs/squashfs/Makefile
-===================================================================
---- linux-2.6.25.1.orig/fs/squashfs/Makefile
-+++ linux-2.6.25.1/fs/squashfs/Makefile
+--- a/fs/squashfs/Makefile
++++ b/fs/squashfs/Makefile
 @@ -4,4 +4,3 @@
  
  obj-$(CONFIG_SQUASHFS) += squashfs.o
  squashfs-y += inode.o
 -squashfs-y += squashfs2_0.o
-Index: linux-2.6.25.1/fs/squashfs/squashfs.h
-===================================================================
---- linux-2.6.25.1.orig/fs/squashfs/squashfs.h
-+++ linux-2.6.25.1/fs/squashfs/squashfs.h
+--- a/fs/squashfs/squashfs.h
++++ b/fs/squashfs/squashfs.h
 @@ -24,6 +24,9 @@
  #ifdef CONFIG_SQUASHFS_1_0_COMPATIBILITY
  #undef CONFIG_SQUASHFS_1_0_COMPATIBILITY