From fafde9ea65a5c720230fe0bb00b1741c52870d89 Mon Sep 17 00:00:00 2001 From: Ben Hutchings Date: Sun, 10 May 2015 02:37:25 +0000 Subject: [PATCH] [x86] tpm: Enable TCG_TIS_ST33ZP24 and TCG_TIS_ST33ZP24_I2C as modules, replacing TCG_ST33_I2C svn path=/dists/trunk/linux/; revision=22575 --- debian/changelog | 2 ++ debian/config/kernelarch-x86/config | 3 ++- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index 36572d9bb..9fbbeae35 100644 --- a/debian/changelog +++ b/debian/changelog @@ -244,6 +244,8 @@ linux (4.0.2-1~exp1) UNRELEASED; urgency=medium * 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 [ Ian Campbell ] * [armhf] Enable support for Freescale SNVS RTC. (Closes: #782364) diff --git a/debian/config/kernelarch-x86/config b/debian/config/kernelarch-x86/config index f357cfcca..e78f8a693 100644 --- a/debian/config/kernelarch-x86/config +++ b/debian/config/kernelarch-x86/config @@ -334,7 +334,8 @@ CONFIG_TCG_TIS_I2C_NUVOTON=m CONFIG_TCG_NSC=m CONFIG_TCG_ATMEL=m CONFIG_TCG_INFINEON=m -CONFIG_TCG_ST33_I2C=m +CONFIG_TCG_TIS_ST33ZP24=m +CONFIG_TCG_TIS_ST33ZP24_I2C=m CONFIG_TCG_XEN=m ##