[kernel] r15908 - in dists/sid/linux-2.6/debian: . patches/bugfix/x86 patches/series

[Ben Hutchings]

Author: benh
Date: Fri Jun 25 01:39:51 2010
New Revision: 15908

Log:
Revert "tpm: autoload tpm_tis based on system PnP IDs" (Closes: #584273)

Added:
   dists/sid/linux-2.6/debian/patches/bugfix/x86/Revert-tpm-autoload-tpm_tis-based-on-system-PnP-IDs.patch
Modified:
   dists/sid/linux-2.6/debian/changelog
   dists/sid/linux-2.6/debian/patches/series/16

Modified: dists/sid/linux-2.6/debian/changelog
==============================================================================
--- dists/sid/linux-2.6/debian/changelog	Thu Jun 24 12:55:38 2010	(r15907)
+++ dists/sid/linux-2.6/debian/changelog	Fri Jun 25 01:39:51 2010	(r15908)
@@ -34,6 +34,8 @@
   * Move NEWS to linux-latest-2.6 (Closes: #586401)
   * 3c59x: Change locking to avoid use of disable_irq() (Closes: #586967)
   * Enable IPv6 support for IPVS (IP_VS_IPV6) (Closes: #584549)
+  * Revert "tpm: autoload tpm_tis based on system PnP IDs", included in
+    stable 2.6.32.12 (Closes: #584273)
 
   [ Aurelien Jarno ]
   * [sh4] fix sh_tmu clocksource following recent nohz changes.

Added: dists/sid/linux-2.6/debian/patches/bugfix/x86/Revert-tpm-autoload-tpm_tis-based-on-system-PnP-IDs.patch
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ dists/sid/linux-2.6/debian/patches/bugfix/x86/Revert-tpm-autoload-tpm_tis-based-on-system-PnP-IDs.patch	Fri Jun 25 01:39:51 2010	(r15908)
@@ -0,0 +1,30 @@
+From 308a483a45d5e912a18655192e28ba629b4c1907 Mon Sep 17 00:00:00 2001
+From: Ben Hutchings <ben at decadent.org.uk>
+Date: Fri, 25 Jun 2010 02:34:22 +0100
+Subject: [PATCH] Revert "tpm: autoload tpm_tis based on system PnP IDs"
+
+This reverts commit a798d8b0cb51bb966763e0feafcbff7097eb3978.
+
+Initialisation of tpm_tis can delay boot for up to 6 minutes on
+systems where the TPM doesn't respond.
+
+See: <http://bugs.debian.org/584273>
+---
+ drivers/char/tpm/tpm_tis.c |    1 -
+ 1 files changed, 0 insertions(+), 1 deletions(-)
+
+diff --git a/drivers/char/tpm/tpm_tis.c b/drivers/char/tpm/tpm_tis.c
+index 2405f17..27e8de4 100644
+--- a/drivers/char/tpm/tpm_tis.c
++++ b/drivers/char/tpm/tpm_tis.c
+@@ -637,7 +637,6 @@ static struct pnp_device_id tpm_pnp_tbl[] __devinitdata = {
+ 	{"", 0},		/* User Specified */
+ 	{"", 0}			/* Terminator */
+ };
+-MODULE_DEVICE_TABLE(pnp, tpm_pnp_tbl);
+ 
+ static __devexit void tpm_tis_pnp_remove(struct pnp_dev *dev)
+ {
+-- 
+1.7.1
+

Modified: dists/sid/linux-2.6/debian/patches/series/16
==============================================================================
--- dists/sid/linux-2.6/debian/patches/series/16	Thu Jun 24 12:55:38 2010	(r15907)
+++ dists/sid/linux-2.6/debian/patches/series/16	Fri Jun 25 01:39:51 2010	(r15908)
@@ -159,3 +159,4 @@
 + bugfix/arm/mv_cesa-sha1-async-drivers.patch
 + bugfix/all/3c59x-Specify-window-for-access-to-windowed-regs.patch
 + bugfix/all/3c59x-Use-fine-grained-locks-for-MII-and-windowed-regs.patch
++ bugfix/x86/Revert-tpm-autoload-tpm_tis-based-on-system-PnP-IDs.patch