[kernel] r10663 - in dists/trunk/linux-2.6/debian: . config/arm config/armel patches/bugfix patches/series

[Martin Michlmayr]

Author: tbm
Date: Tue Feb 26 12:26:06 2008
New Revision: 10663

Log:
[arm/mips] Disable CRYPTO_DEV_HIFN_795X since it doesn't compile.


Added:
   dists/trunk/linux-2.6/debian/patches/bugfix/disable-hifn_795X.patch
Modified:
   dists/trunk/linux-2.6/debian/changelog
   dists/trunk/linux-2.6/debian/config/arm/config
   dists/trunk/linux-2.6/debian/config/armel/config
   dists/trunk/linux-2.6/debian/patches/series/1~experimental.1

Modified: dists/trunk/linux-2.6/debian/changelog
==============================================================================
--- dists/trunk/linux-2.6/debian/changelog	(original)
+++ dists/trunk/linux-2.6/debian/changelog	Tue Feb 26 12:26:06 2008
@@ -34,9 +34,9 @@
   [ Martin Michlmayr ]
   * [arm/armel] Add a kernel for Orion based devices, such as the QNAP
     TS-109/TS-209.
-  * [arm/armel] Unset CRYPTO_DEV_HIFN_795X since it causes a build failure.
   * [arm] Pad the SSB structure so crossing-compiling a kernel for ARM
      won't fail because of sanity checks; patch from Gordon Farquharson.
+  * [arm/mips] Disable CRYPTO_DEV_HIFN_795X since it doesn't compile.
 
   [ Daniel Baumann ]
   * Added patch from unionfs upstream to export release_open_intent symbol.

Modified: dists/trunk/linux-2.6/debian/config/arm/config
==============================================================================
--- dists/trunk/linux-2.6/debian/config/arm/config	(original)
+++ dists/trunk/linux-2.6/debian/config/arm/config	Tue Feb 26 12:26:06 2008
@@ -26,4 +26,3 @@
 # CONFIG_SCSI_QLA_ISCSI is not set
 # CONFIG_SCSI_AIC94XX is not set
 # CONFIG_SCSI_HPTIOP is not set
-# CONFIG_CRYPTO_DEV_HIFN_795X is not set

Modified: dists/trunk/linux-2.6/debian/config/armel/config
==============================================================================
--- dists/trunk/linux-2.6/debian/config/armel/config	(original)
+++ dists/trunk/linux-2.6/debian/config/armel/config	Tue Feb 26 12:26:06 2008
@@ -15,4 +15,3 @@
 CONFIG_TMPFS=y
 CONFIG_AEABI=y
 CONFIG_OABI_COMPAT=y
-# CONFIG_CRYPTO_DEV_HIFN_795X is not set

Added: dists/trunk/linux-2.6/debian/patches/bugfix/disable-hifn_795X.patch
==============================================================================
--- (empty file)
+++ dists/trunk/linux-2.6/debian/patches/bugfix/disable-hifn_795X.patch	Tue Feb 26 12:26:06 2008
@@ -0,0 +1,14 @@
+  Building modules, stage 2.
+  MODPOST 759 modules
+ERROR: "__divdi3" [drivers/crypto/hifn_795x.ko] undefined!
+
+--- a/drivers/crypto/Kconfig	2008-02-26 09:14:14.000000000 +0000
++++ b/drivers/crypto/Kconfig	2008-02-26 09:15:11.000000000 +0000
+@@ -149,6 +149,7 @@
+ 	select CRYPTO_BLKCIPHER
+ 	select HW_RANDOM if CRYPTO_DEV_HIFN_795X_RNG
+ 	depends on PCI
++	depends on (!MIPS && !ARM) || BROKEN
+ 	help
+ 	  This option allows you to have support for HIFN 795x crypto adapters.
+ 

Modified: dists/trunk/linux-2.6/debian/patches/series/1~experimental.1
==============================================================================
--- dists/trunk/linux-2.6/debian/patches/series/1~experimental.1	(original)
+++ dists/trunk/linux-2.6/debian/patches/series/1~experimental.1	Tue Feb 26 12:26:06 2008
@@ -31,3 +31,4 @@
 + features/all/at76.patch 
 + bugfix/arm/ignore-invalid-memtags.patch
 + bugfix/arm/pad-ssb-structure.patch
++ bugfix/disable-hifn_795X.patch