[kernel] r14515 - in dists/trunk/linux-2.6/debian/config: . kernelarch-x86

[Bastian Blank]

Author: waldi
Date: Fri Oct 30 08:49:05 2009
New Revision: 14515

Log:
debian/config/kernelarch-x86/config:
Move x86 specific options from debian/config/config.

Modified:
   dists/trunk/linux-2.6/debian/config/config
   dists/trunk/linux-2.6/debian/config/kernelarch-x86/config

Modified: dists/trunk/linux-2.6/debian/config/config
==============================================================================
--- dists/trunk/linux-2.6/debian/config/config	Fri Oct 30 08:46:42 2009	(r14514)
+++ dists/trunk/linux-2.6/debian/config/config	Fri Oct 30 08:49:05 2009	(r14515)
@@ -275,9 +275,6 @@
 ## file: drivers/crypto/Kconfig
 ##
 CONFIG_CRYPTO_HW=y
-CONFIG_CRYPTO_DEV_PADLOCK=m
-CONFIG_CRYPTO_DEV_PADLOCK_AES=m
-CONFIG_CRYPTO_DEV_PADLOCK_SHA=m
 CONFIG_CRYPTO_DEV_HIFN_795X=m
 CONFIG_CRYPTO_DEV_HIFN_795X_RNG=y
 

Modified: dists/trunk/linux-2.6/debian/config/kernelarch-x86/config
==============================================================================
--- dists/trunk/linux-2.6/debian/config/kernelarch-x86/config	Fri Oct 30 08:46:42 2009	(r14514)
+++ dists/trunk/linux-2.6/debian/config/kernelarch-x86/config	Fri Oct 30 08:49:05 2009	(r14515)
@@ -299,6 +299,13 @@
 CONFIG_CPU_IDLE=y
 
 ##
+## file: drivers/crypto/Kconfig
+##
+CONFIG_CRYPTO_DEV_PADLOCK=m
+CONFIG_CRYPTO_DEV_PADLOCK_AES=m
+CONFIG_CRYPTO_DEV_PADLOCK_SHA=m
+
+##
 ## file: drivers/dma/Kconfig
 ##
 CONFIG_DMADEVICES=y