From c3d0a74764711a17f5e6081a503ce2a1d7f83bc3 Mon Sep 17 00:00:00 2001
From: Ben Hutchings <benh@debian.org>
Date: Thu, 12 May 2011 03:18:58 +0000
Subject: [PATCH] [!x86] Disable TPM drivers. TPMs are currently only fitted in
 PCs.

svn path=/dists/trunk/linux-2.6/; revision=17393
---
 debian/changelog                    | 4 ++++
 debian/config/config                | 9 ---------
 debian/config/kernelarch-x86/config | 9 +++++++++
 3 files changed, 13 insertions(+), 9 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 01eb1d424..e23f26ac4 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -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 @@ linux-2.6 (2.6.39~rc7-1~experimental.2) UNRELEASED; urgency=low
   * 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@debian.org>  Tue, 10 May 2011 23:24:26 +0200
 
 linux-2.6 (2.6.39~rc7-1~experimental.1) experimental; urgency=low
diff --git a/debian/config/config b/debian/config/config
index 2acb9b71d..955044576 100644
--- a/debian/config/config
+++ b/debian/config/config
@@ -253,15 +253,6 @@ CONFIG_CARDMAN_4000=m
 CONFIG_CARDMAN_4040=m
 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
 ##
diff --git a/debian/config/kernelarch-x86/config b/debian/config/kernelarch-x86/config
index b8ebebae9..c28edc176 100644
--- a/debian/config/kernelarch-x86/config
+++ b/debian/config/kernelarch-x86/config
@@ -314,6 +314,15 @@ CONFIG_IPMI_SI=m
 CONFIG_IPMI_WATCHDOG=m
 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
 ##