[kernel] r9435 - in dists/trunk/linux-2.6/debian: . config

[Maximilian Attems]

Author: maks
Date: Fri Aug 31 23:41:11 2007
New Revision: 9435

Log:
enable TCG_TIS aka TPM spec 1.2


Modified:
   dists/trunk/linux-2.6/debian/changelog
   dists/trunk/linux-2.6/debian/config/config

Modified: dists/trunk/linux-2.6/debian/changelog
==============================================================================
--- dists/trunk/linux-2.6/debian/changelog	(original)
+++ dists/trunk/linux-2.6/debian/changelog	Fri Aug 31 23:41:11 2007
@@ -14,7 +14,7 @@
     DVB_USB_AF9005_REMOTE, CRC7, I2C_TAOS_EVM, DS1682, SENSORS_TSL2550,
     SPI_LM70_LLP, SPI_TLE62X0, W1_SLAVE_DS2760, TUNER_TEA5761, NET_9P,
     DM_MULTIPATH_RDAC, NET_SCH_RR, EEPROM_93CX6, PPPOL2TP, CRYPTO_HW, UIO,
-    UIO_CIF, SND_CS5530, RTL8187, PC300TOO.
+    UIO_CIF, SND_CS5530, RTL8187, PC300TOO, TCG_TIS.
   * [i386] Enable lguest.
   * [amd64, i386] Enable VIDEO_OUTPUT_CONTROL, THINKPAD_ACPI_INPUT_ENABLED,
     NETDEVICES_MULTIQUEUE.
@@ -30,7 +30,7 @@
   [ Bastian Blank ]
   * Add unpriviledged only Xen support.
 
- -- maximilian attems <maks at debian.org>  Sat, 01 Sep 2007 01:29:49 +0200
+ -- maximilian attems <maks at debian.org>  Sat, 01 Sep 2007 01:40:16 +0200
 
 linux-2.6 (2.6.22-2) UNRELEASED; urgency=low
 

Modified: dists/trunk/linux-2.6/debian/config/config
==============================================================================
--- dists/trunk/linux-2.6/debian/config/config	(original)
+++ dists/trunk/linux-2.6/debian/config/config	Fri Aug 31 23:41:11 2007
@@ -864,8 +864,9 @@
 CONFIG_PLIST=y
 
 CONFIG_TCG_TPM=m
-CONFIG_TCG_ATMEL=m
+CONFIG_TCG_TIS=m
 CONFIG_TCG_NSC=m
+CONFIG_TCG_ATMEL=m
 CONFIG_SERIAL_8250_ACCENT=m
 CONFIG_NFSD_V2_ACL=y
 CONFIG_I2O_EXT_ADAPTEC=y