diff options
| author | wbx <wbx@3c298f89-4303-0410-b956-a3cf2f4a3e73> | 2005-08-28 22:42:40 +0000 |
|---|---|---|
| committer | wbx <wbx@3c298f89-4303-0410-b956-a3cf2f4a3e73> | 2005-08-28 22:42:40 +0000 |
| commit | abffb510db2f4f24bfa71ca04f4a66a3217c81e1 (patch) | |
| tree | f8dbbe5ec59650cf173fc04463373d9a40d2a383 /target/linux/linux-2.6/patches | |
| parent | f8968501098182115a67b4d7bf664aec680cb356 (diff) | |
fix compile error on squashfs-lzma patch
git-svn-id: svn://svn.openwrt.org/openwrt/trunk/openwrt@1778 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'target/linux/linux-2.6/patches')
| -rw-r--r-- | target/linux/linux-2.6/patches/generic/002-squashfs_lzma.patch | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/target/linux/linux-2.6/patches/generic/002-squashfs_lzma.patch b/target/linux/linux-2.6/patches/generic/002-squashfs_lzma.patch index 1db27eef0..be4c19bd7 100644 --- a/target/linux/linux-2.6/patches/generic/002-squashfs_lzma.patch +++ b/target/linux/linux-2.6/patches/generic/002-squashfs_lzma.patch @@ -780,7 +780,7 @@ diff -Nur linux-2.6.12.5-brcm-squashfs/fs/squashfs/Makefile linux-2.6.12.5-brcm- +squashfs-objs := inode.o LzmaDecode.o diff -Nur linux-2.6.12.5-brcm-squashfs/fs/squashfs/inode.c linux-2.6.12.5-brcm-squashfs-lzma/fs/squashfs/inode.c --- linux-2.6.12.5-brcm-squashfs/fs/squashfs/inode.c 2005-08-28 23:44:05.045246000 +0200 -+++ linux-2.6.12.5-brcm-squashfs-lzma/fs/squashfs/inode.c 2005-08-29 00:05:51.534629648 +0200 ++++ linux-2.6.12.5-brcm-squashfs-lzma/fs/squashfs/inode.c 2005-08-29 00:19:48.473476904 +0200 @@ -3,6 +3,9 @@ * * Copyright (c) 2002, 2003, 2004, 2005 Phillip Lougher <phillip@lougher.demon.co.uk> @@ -859,7 +859,7 @@ diff -Nur linux-2.6.12.5-brcm-squashfs/fs/squashfs/inode.c linux-2.6.12.5-brcm-s up(&read_data_mutex); } -@@ -1725,12 +1759,13 @@ +@@ -1725,14 +1759,17 @@ printk(KERN_INFO "Squashfs 2.2 (released 2005/07/03) (C) 2002-2005 Phillip Lougher\n"); @@ -872,9 +872,13 @@ diff -Nur linux-2.6.12.5-brcm-squashfs/fs/squashfs/inode.c linux-2.6.12.5-brcm-s - +#endif if((err = register_filesystem(&squashfs_fs_type))) { ++#ifndef SQUASHFS_LZMA vfree(stream.workspace); ++#endif destroy_inodecache(); -@@ -1742,7 +1777,9 @@ + } + +@@ -1742,7 +1779,9 @@ static void __exit exit_squashfs_fs(void) { |