summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPhilipp Matthias Hahn <pmhahn@titan.lahn.de>2005-09-06 15:17:56 -0700
committerLinus Torvalds <torvalds@g5.osdl.org>2005-09-07 16:57:36 -0700
commit5ba4d46dc44c5399bc4e7a39239de5a1690848a4 (patch)
tree140c44d07ac46fc5392806608f2574bc8810ef46
parent1e1a5cc77ec019e0d67c2abcbd486e4f3ac947a4 (diff)
downloadop-kernel-dev-5ba4d46dc44c5399bc4e7a39239de5a1690848a4.zip
op-kernel-dev-5ba4d46dc44c5399bc4e7a39239de5a1690848a4.tar.gz
[PATCH] tpm: fix tpm_atmel.c on ICH6
While installing Debian on our new IBM X41 Tablet, I tried briefly to use the built-in Atmel TPM. The Athmel TPM is also located on the LPC-bus of the ICH6. To make it work I had to apply the following patch: Signed-off-by: Philipp Matthias Hahn <pmhahn@titan.lahn.de> Acked-by: Kylene Jo Hall <kjhall@us.ibm.com> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
-rw-r--r--drivers/char/tpm/tpm_atmel.c3
1 files changed, 3 insertions, 0 deletions
diff --git a/drivers/char/tpm/tpm_atmel.c b/drivers/char/tpm/tpm_atmel.c
index cc2cc77..c0d6491 100644
--- a/drivers/char/tpm/tpm_atmel.c
+++ b/drivers/char/tpm/tpm_atmel.c
@@ -206,6 +206,9 @@ static struct pci_device_id tpm_pci_tbl[] __devinitdata = {
{PCI_DEVICE(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_82801DB_0)},
{PCI_DEVICE(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_82801DB_12)},
{PCI_DEVICE(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_82801EB_0)},
+ {PCI_DEVICE(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_ICH6_0)},
+ {PCI_DEVICE(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_ICH6_1)},
+ {PCI_DEVICE(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_ICH7_0)},
{PCI_DEVICE(PCI_VENDOR_ID_AMD, PCI_DEVICE_ID_AMD_8111_LPC)},
{PCI_DEVICE(PCI_VENDOR_ID_SERVERWORKS, PCI_DEVICE_ID_SERVERWORKS_CSB6LPC)},
{0,}
OpenPOWER on IntegriCloud