diff options
author | Gabor Juhos <juhosg@openwrt.org> | 2008-11-07 08:44:56 +0000 |
---|---|---|
committer | Gabor Juhos <juhosg@openwrt.org> | 2008-11-07 08:44:56 +0000 |
commit | a4ffbea09c88fbe9cefcf0080eda0809598f3ee1 (patch) | |
tree | f3261452de6d5a1c11fd8ed250f2a42f6d0eb008 /target/linux/generic-2.6/patches-2.6.25/950-ocf-linux-26-20080704.patch | |
parent | d9d70c2ebb0ad11fc61be3e9bc7148fe2106ab76 (diff) | |
download | upstream-a4ffbea09c88fbe9cefcf0080eda0809598f3ee1.tar.gz upstream-a4ffbea09c88fbe9cefcf0080eda0809598f3ee1.tar.bz2 upstream-a4ffbea09c88fbe9cefcf0080eda0809598f3ee1.zip |
[kernel] update to 2.6.25.19, and refresh patches
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@13137 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'target/linux/generic-2.6/patches-2.6.25/950-ocf-linux-26-20080704.patch')
-rw-r--r-- | target/linux/generic-2.6/patches-2.6.25/950-ocf-linux-26-20080704.patch | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/target/linux/generic-2.6/patches-2.6.25/950-ocf-linux-26-20080704.patch b/target/linux/generic-2.6/patches-2.6.25/950-ocf-linux-26-20080704.patch index 81789b82d3..7912a4e8dd 100644 --- a/target/linux/generic-2.6/patches-2.6.25/950-ocf-linux-26-20080704.patch +++ b/target/linux/generic-2.6/patches-2.6.25/950-ocf-linux-26-20080704.patch @@ -1,6 +1,6 @@ --- a/crypto/Kconfig +++ b/crypto/Kconfig -@@ -593,3 +593,6 @@ +@@ -593,3 +593,6 @@ config CRYPTO_LZO source "drivers/crypto/Kconfig" endif # if CRYPTO @@ -9,7 +9,7 @@ + --- a/crypto/Makefile +++ b/crypto/Makefile -@@ -65,6 +65,8 @@ +@@ -65,6 +65,8 @@ obj-$(CONFIG_CRYPTO_LZO) += lzo.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. -@@ -669,6 +679,61 @@ +@@ -669,6 +679,61 @@ void add_disk_randomness(struct gendisk } #endif @@ -108,7 +108,7 @@ /********************************************************************* --- a/fs/fcntl.c +++ b/fs/fcntl.c -@@ -202,6 +202,7 @@ +@@ -202,6 +202,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); |