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

[Ben Hutchings]

Author: benh
Date: Thu May 12 03:18:58 2011
New Revision: 17393

Log:
[!x86] Disable TPM drivers. TPMs are currently only fitted in PCs.

Modified:
   dists/trunk/linux-2.6/debian/changelog
   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/changelog
==============================================================================
--- dists/trunk/linux-2.6/debian/changelog	Thu May 12 01:17:25 2011	(r17392)
+++ dists/trunk/linux-2.6/debian/changelog	Thu May 12 03:18:58 2011	(r17393)
@@ -1,5 +1,6 @@
 linux-2.6 (2.6.39~rc7-1~experimental.2) UNRELEASED; urgency=low
 
+  [ maximilian attems ]
   * [x86] Enable CRYPTO_AES_NI_INTEL for all flavours. (closes: #623631)
   * topconfig: Enable SND_USB_6FIRE, SND_FIREWIRE_SPEAKERS,
     MEDIA_CONTROLLER, DVB_USB_TECHNISAT_USB2, USB_GSPCA_NW80X,
@@ -8,6 +9,9 @@
   * topconfig enable mem cgroup RESOURCE_COUNTERS, CGROUP_MEM_RES_CTLR.
     (closes: #534964)
 
+  [ Ben Hutchings ]
+  * [!x86] Disable TPM drivers. TPMs are currently only fitted in PCs.
+
  -- maximilian attems <maks at debian.org>  Tue, 10 May 2011 23:24:26 +0200
 
 linux-2.6 (2.6.39~rc7-1~experimental.1) experimental; urgency=low

Modified: dists/trunk/linux-2.6/debian/config/config
==============================================================================
--- dists/trunk/linux-2.6/debian/config/config	Thu May 12 01:17:25 2011	(r17392)
+++ dists/trunk/linux-2.6/debian/config/config	Thu May 12 03:18:58 2011	(r17393)
@@ -254,15 +254,6 @@
 CONFIG_IPWIRELESS=m
 
 ##
-## file: drivers/char/tpm/Kconfig
-##
-CONFIG_TCG_TPM=m
-CONFIG_TCG_TIS=m
-CONFIG_TCG_NSC=m
-CONFIG_TCG_ATMEL=m
-CONFIG_TCG_INFINEON=m
-
-##
 ## file: drivers/connector/Kconfig
 ##
 CONFIG_CONNECTOR=m

Modified: dists/trunk/linux-2.6/debian/config/kernelarch-x86/config
==============================================================================
--- dists/trunk/linux-2.6/debian/config/kernelarch-x86/config	Thu May 12 01:17:25 2011	(r17392)
+++ dists/trunk/linux-2.6/debian/config/kernelarch-x86/config	Thu May 12 03:18:58 2011	(r17393)
@@ -315,6 +315,15 @@
 CONFIG_IPMI_POWEROFF=m
 
 ##
+## file: drivers/char/tpm/Kconfig
+##
+CONFIG_TCG_TPM=m
+CONFIG_TCG_TIS=m
+CONFIG_TCG_NSC=m
+CONFIG_TCG_ATMEL=m
+CONFIG_TCG_INFINEON=m
+
+##
 ## file: drivers/cpufreq/Kconfig
 ##
 ## choice: Default CPUFreq governor