[target] generic: ESFQ patch, only include net/netfilter/nf_conntrack.h when CONFIG_N...

[openwrt.git] / target / linux / generic-2.6 / patches-2.6.25 / 005-squashfs_fix.patch

diff --git a/target/linux/generic-2.6/patches-2.6.25/005-squashfs_fix.patch b/target/linux/generic-2.6/patches-2.6.25/005-squashfs_fix.patch
index 66f8ccc..56b7fc2 100644 (file)
--- a/target/linux/generic-2.6/patches-2.6.25/005-squashfs_fix.patch
+++ b/target/linux/generic-2.6/patches-2.6.25/005-squashfs_fix.patch
@@ -1,7 +1,5 @@
-Index: linux-2.6.25.1/fs/squashfs/inode.c
-===================================================================
---- linux-2.6.25.1.orig/fs/squashfs/inode.c
-+++ linux-2.6.25.1/fs/squashfs/inode.c
+--- a/fs/squashfs/inode.c
++++ b/fs/squashfs/inode.c
 @@ -33,6 +33,7 @@
  #include <linux/fs.h>
  #include <linux/smp_lock.h>