diff options
| author | Imre Kaloz <kaloz@openwrt.org> | 2009-11-02 09:54:06 +0000 |
|---|---|---|
| committer | Imre Kaloz <kaloz@openwrt.org> | 2009-11-02 09:54:06 +0000 |
| commit | 50800bb20709df5a7a6f3a1983d75e4255c844a9 (patch) | |
| tree | c9f8f7674022acf06ba7a0d8244e1f4ee9c5feb4 /target/linux/generic-2.6/patches-2.6.30 | |
| parent | 5aba9ecbd38048f2445f70e9959a763ec82fe7fa (diff) | |
| download | master-31e0f0ae-50800bb20709df5a7a6f3a1983d75e4255c844a9.tar.gz master-31e0f0ae-50800bb20709df5a7a6f3a1983d75e4255c844a9.tar.bz2 master-31e0f0ae-50800bb20709df5a7a6f3a1983d75e4255c844a9.zip | |
resync 2.6.30/2.6.31 patches
SVN-Revision: 18270
Diffstat (limited to 'target/linux/generic-2.6/patches-2.6.30')
| -rw-r--r-- | target/linux/generic-2.6/patches-2.6.30/970-ocf_kbuild_integration.patch | 4 | ||||
| -rw-r--r-- | target/linux/generic-2.6/patches-2.6.30/977-textsearch_kconfig_hacks.patch | 2 |
2 files changed, 3 insertions, 3 deletions
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 bf229eab82..b24d59cfff 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 -@@ -784,6 +784,8 @@ config CRYPTO_ANSI_CPRNG +@@ -778,6 +778,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 -@@ -86,6 +86,11 @@ obj-$(CONFIG_CRYPTO_ANSI_CPRNG) += ansi_ +@@ -85,6 +85,11 @@ obj-$(CONFIG_CRYPTO_ANSI_CPRNG) += ansi_ obj-$(CONFIG_CRYPTO_TEST) += tcrypt.o # diff --git a/target/linux/generic-2.6/patches-2.6.30/977-textsearch_kconfig_hacks.patch b/target/linux/generic-2.6/patches-2.6.30/977-textsearch_kconfig_hacks.patch index 66a86ad995..655ebae645 100644 --- a/target/linux/generic-2.6/patches-2.6.30/977-textsearch_kconfig_hacks.patch +++ b/target/linux/generic-2.6/patches-2.6.30/977-textsearch_kconfig_hacks.patch @@ -1,6 +1,6 @@ --- a/lib/Kconfig +++ b/lib/Kconfig -@@ -142,16 +142,16 @@ config REED_SOLOMON_DEC16 +@@ -145,16 +145,16 @@ config REED_SOLOMON_DEC16 # Textsearch support is select'ed if needed # config TEXTSEARCH |