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

[Ben Hutchings]

Author: benh
Date: Sun May 10 03:02:15 2015
New Revision: 22577

Log:
[x86] tpm: Enable TCG_TIS_I2C_ST33 as module, replacing TCG_ST33_I2C

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

Modified: dists/trunk/linux/debian/changelog
==============================================================================
--- dists/trunk/linux/debian/changelog	Sun May 10 02:57:49 2015	(r22576)
+++ dists/trunk/linux/debian/changelog	Sun May 10 03:02:15 2015	(r22577)
@@ -243,8 +243,7 @@
   * sound/firewire: Enable SND_OXFW as module, replacing SND_FIREWIRE_SPEAKERS
   * [x86] Enable DW_DMAC and re-enable SND_SOC_INTEL_HASWELL_MACH,
     SND_SOC_INTEL_BYT_RT5640_MACH, SND_SOC_INTEL_BYT_MAX98090_MACH as modules
-  * [x86] tpm: Enable TCG_TIS_ST33ZP24 and TCG_TIS_ST33ZP24_I2C as modules,
-    replacing TCG_ST33_I2C
+  * [x86] tpm: Enable TCG_TIS_I2C_ST33 as module, replacing TCG_ST33_I2C
 
   [ Ian Campbell ]
   * [armhf] Enable support for Freescale SNVS RTC. (Closes: #782364)

Modified: dists/trunk/linux/debian/config/kernelarch-x86/config
==============================================================================
--- dists/trunk/linux/debian/config/kernelarch-x86/config	Sun May 10 02:57:49 2015	(r22576)
+++ dists/trunk/linux/debian/config/kernelarch-x86/config	Sun May 10 03:02:15 2015	(r22577)
@@ -334,8 +334,7 @@
 CONFIG_TCG_NSC=m
 CONFIG_TCG_ATMEL=m
 CONFIG_TCG_INFINEON=m
-CONFIG_TCG_TIS_ST33ZP24=m
-CONFIG_TCG_TIS_ST33ZP24_I2C=m
+CONFIG_TCG_TIS_I2C_ST33=m
 CONFIG_TCG_XEN=m
 
 ##