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

svn path=/dists/trunk/linux/; revision=22577
This commit is contained in:
Ben Hutchings 2015-05-10 03:02:15 +00:00
parent 398d274287
commit 8715123851
2 changed files with 2 additions and 4 deletions

3
debian/changelog vendored
View File

@ -243,8 +243,7 @@ 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
* [x86] tpm: Enable TCG_TIS_I2C_ST33 as module, replacing TCG_ST33_I2C
[ Ian Campbell ]
* [armhf] Enable support for Freescale SNVS RTC. (Closes: #782364)

View File

@ -334,8 +334,7 @@ CONFIG_TCG_TIS_I2C_NUVOTON=m
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
##