diff options
| author | Gabor Juhos <juhosg@openwrt.org> | 2008-11-06 20:55:33 +0000 |
|---|---|---|
| committer | Gabor Juhos <juhosg@openwrt.org> | 2008-11-06 20:55:33 +0000 |
| commit | d9d70c2ebb0ad11fc61be3e9bc7148fe2106ab76 (patch) | |
| tree | 902ba8bee0eeb73fdb63e9402112c8c0ff4fb12f /target/linux/generic-2.6/patches-2.6.26/970-ocf_20080704.patch | |
| parent | 226d8cb16579aecaaf52228177a795e276bf8f06 (diff) | |
| download | upstream-d9d70c2ebb0ad11fc61be3e9bc7148fe2106ab76.tar.gz upstream-d9d70c2ebb0ad11fc61be3e9bc7148fe2106ab76.tar.bz2 upstream-d9d70c2ebb0ad11fc61be3e9bc7148fe2106ab76.zip | |
[kernel] refresh 2.6.26 patches
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@13135 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'target/linux/generic-2.6/patches-2.6.26/970-ocf_20080704.patch')
| -rw-r--r-- | target/linux/generic-2.6/patches-2.6.26/970-ocf_20080704.patch | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/target/linux/generic-2.6/patches-2.6.26/970-ocf_20080704.patch b/target/linux/generic-2.6/patches-2.6.26/970-ocf_20080704.patch index 003d28c0ca..7c07cd107e 100644 --- a/target/linux/generic-2.6/patches-2.6.26/970-ocf_20080704.patch +++ b/target/linux/generic-2.6/patches-2.6.26/970-ocf_20080704.patch @@ -1,6 +1,6 @@ --- a/crypto/Kconfig +++ b/crypto/Kconfig -@@ -678,3 +678,6 @@ +@@ -678,3 +678,6 @@ config CRYPTO_PRNG source "drivers/crypto/Kconfig" endif # if CRYPTO @@ -9,7 +9,7 @@ + --- a/crypto/Makefile +++ b/crypto/Makefile -@@ -72,6 +72,8 @@ +@@ -72,6 +72,8 @@ obj-$(CONFIG_CRYPTO_LZO) += lzo.o obj-$(CONFIG_CRYPTO_PRNG) += prng.o obj-$(CONFIG_CRYPTO_TEST) += tcrypt.o @@ -44,7 +44,7 @@ * All of these routines try to estimate how many bits of randomness a * particular randomness source. They do this by keeping track of the * first and second order deltas of the event timings. -@@ -667,6 +677,61 @@ +@@ -667,6 +677,61 @@ void add_disk_randomness(struct gendisk } #endif @@ -108,7 +108,7 @@ /********************************************************************* --- a/fs/fcntl.c +++ b/fs/fcntl.c -@@ -191,6 +191,7 @@ +@@ -191,6 +191,7 @@ asmlinkage long sys_dup(unsigned int fil ret = dupfd(file, 0, 0); return ret; } @@ -167,7 +167,7 @@ struct rand_pool_info { int entropy_count; int buf_size; -@@ -48,6 +73,10 @@ +@@ -48,6 +73,10 @@ extern void add_input_randomness(unsigne unsigned int value); extern void add_interrupt_randomness(int irq); |