diff options
| author | juhosg <juhosg@3c298f89-4303-0410-b956-a3cf2f4a3e73> | 2009-05-22 09:46:02 +0000 |
|---|---|---|
| committer | juhosg <juhosg@3c298f89-4303-0410-b956-a3cf2f4a3e73> | 2009-05-22 09:46:02 +0000 |
| commit | d5b89889f883f4aebce0d0bc8d16db629f03428b (patch) | |
| tree | 8b91c374f968fce69e0515566e29a0d8ac7e2fd8 | |
| parent | 5226ed98ad838ab441540190364b5c505edc329b (diff) | |
[kernel] generic-2.6/2.6.30: refresh patches
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@15981 3c298f89-4303-0410-b956-a3cf2f4a3e73
4 files changed, 7 insertions, 7 deletions
diff --git a/target/linux/generic-2.6/patches-2.6.30/051-squashfs_pcomp.patch b/target/linux/generic-2.6/patches-2.6.30/051-squashfs_pcomp.patch index 271c4e5c8b..fc2a731dde 100644 --- a/target/linux/generic-2.6/patches-2.6.30/051-squashfs_pcomp.patch +++ b/target/linux/generic-2.6/patches-2.6.30/051-squashfs_pcomp.patch @@ -201,7 +201,7 @@ goto failure; } -@@ -284,17 +311,18 @@ failed_mount: +@@ -294,17 +321,18 @@ failed_mount: kfree(msblk->inode_lookup_table); kfree(msblk->fragment_index); kfree(msblk->id_table); @@ -223,7 +223,7 @@ } -@@ -333,7 +361,7 @@ static void squashfs_put_super(struct su +@@ -346,7 +374,7 @@ static void squashfs_put_super(struct su kfree(sbi->id_table); kfree(sbi->fragment_index); kfree(sbi->meta_index); diff --git a/target/linux/generic-2.6/patches-2.6.30/052-pcomp_lzma_support.patch b/target/linux/generic-2.6/patches-2.6.30/052-pcomp_lzma_support.patch index c5265e9b29..3259db40a8 100644 --- a/target/linux/generic-2.6/patches-2.6.30/052-pcomp_lzma_support.patch +++ b/target/linux/generic-2.6/patches-2.6.30/052-pcomp_lzma_support.patch @@ -713,7 +713,7 @@ +MODULE_AUTHOR("Felix Fietkau <nbd@openwrt.org>"); --- a/crypto/Kconfig +++ b/crypto/Kconfig -@@ -728,6 +728,12 @@ config CRYPTO_ZLIB +@@ -758,6 +758,12 @@ config CRYPTO_ZLIB help This is the zlib algorithm. @@ -728,7 +728,7 @@ select CRYPTO_ALGAPI --- a/crypto/Makefile +++ b/crypto/Makefile -@@ -73,6 +73,7 @@ obj-$(CONFIG_CRYPTO_SEED) += seed.o +@@ -75,6 +75,7 @@ obj-$(CONFIG_CRYPTO_SEED) += seed.o obj-$(CONFIG_CRYPTO_SALSA20) += salsa20_generic.o obj-$(CONFIG_CRYPTO_DEFLATE) += deflate.o obj-$(CONFIG_CRYPTO_ZLIB) += zlib.o diff --git a/target/linux/generic-2.6/patches-2.6.30/053-squashfs_lzma.patch b/target/linux/generic-2.6/patches-2.6.30/053-squashfs_lzma.patch index b632e05926..aea4aced70 100644 --- a/target/linux/generic-2.6/patches-2.6.30/053-squashfs_lzma.patch +++ b/target/linux/generic-2.6/patches-2.6.30/053-squashfs_lzma.patch @@ -188,7 +188,7 @@ if (err < 0) goto failed_mount; -@@ -305,21 +342,16 @@ allocate_root: +@@ -315,21 +352,16 @@ allocate_root: return 0; failed_mount: diff --git a/target/linux/generic-2.6/patches-2.6.30/970-ocf_kbuild_integration.patch b/target/linux/generic-2.6/patches-2.6.30/970-ocf_kbuild_integration.patch index b24d59cfff..bf229eab82 100644 --- a/target/linux/generic-2.6/patches-2.6.30/970-ocf_kbuild_integration.patch +++ b/target/linux/generic-2.6/patches-2.6.30/970-ocf_kbuild_integration.patch @@ -1,6 +1,6 @@ --- a/crypto/Kconfig +++ b/crypto/Kconfig -@@ -778,6 +778,8 @@ config CRYPTO_ANSI_CPRNG +@@ -784,6 +784,8 @@ config CRYPTO_ANSI_CPRNG for cryptographic modules. Uses the Algorithm specified in ANSI X9.31 A.2.4 @@ -11,7 +11,7 @@ endif # if CRYPTO --- a/crypto/Makefile +++ b/crypto/Makefile -@@ -85,6 +85,11 @@ obj-$(CONFIG_CRYPTO_ANSI_CPRNG) += ansi_ +@@ -86,6 +86,11 @@ obj-$(CONFIG_CRYPTO_ANSI_CPRNG) += ansi_ obj-$(CONFIG_CRYPTO_TEST) += tcrypt.o # |