break trunk temporary - upgrade to 2.6.21.1 and iptables 1.3.7

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

diff --git a/target/linux/generic-2.6/patches/010-disable_old_squashfs_compatibility.patch b/target/linux/generic-2.6/patches/010-disable_old_squashfs_compatibility.patch
index dbc0185..4d556a4 100644 (file)
--- a/target/linux/generic-2.6/patches/010-disable_old_squashfs_compatibility.patch
+++ b/target/linux/generic-2.6/patches/010-disable_old_squashfs_compatibility.patch
@@ -1,12 +1,11 @@
 diff -urN linux-2.6.19.old/fs/squashfs/Makefile linux-2.6.19.dev/fs/squashfs/Makefile
 --- linux-2.6.19.old/fs/squashfs/Makefile      2006-12-14 03:13:22.000000000 +0100
 +++ linux-2.6.19.dev/fs/squashfs/Makefile      2006-12-14 03:13:31.000000000 +0100
 diff -urN linux-2.6.19.old/fs/squashfs/Makefile linux-2.6.19.dev/fs/squashfs/Makefile
 --- linux-2.6.19.old/fs/squashfs/Makefile      2006-12-14 03:13:22.000000000 +0100
 +++ linux-2.6.19.dev/fs/squashfs/Makefile      2006-12-14 03:13:31.000000000 +0100

-@@ -4,5 +4,4 @@
+@@ -4,4 +4,3 @@

  
  obj-$(CONFIG_SQUASHFS) += squashfs.o
  squashfs-y += inode.o
 -squashfs-y += squashfs2_0.o
  
  obj-$(CONFIG_SQUASHFS) += squashfs.o
  squashfs-y += inode.o
 -squashfs-y += squashfs2_0.o

- squashfs-y += LzmaDecode.o

 diff -urN linux-2.6.19.old/fs/squashfs/squashfs.h linux-2.6.19.dev/fs/squashfs/squashfs.h
 --- linux-2.6.19.old/fs/squashfs/squashfs.h    2006-12-14 03:13:20.000000000 +0100
 +++ linux-2.6.19.dev/fs/squashfs/squashfs.h    2006-12-14 03:13:31.000000000 +0100
 diff -urN linux-2.6.19.old/fs/squashfs/squashfs.h linux-2.6.19.dev/fs/squashfs/squashfs.h
 --- linux-2.6.19.old/fs/squashfs/squashfs.h    2006-12-14 03:13:20.000000000 +0100
 +++ linux-2.6.19.dev/fs/squashfs/squashfs.h    2006-12-14 03:13:31.000000000 +0100