summaryrefslogtreecommitdiffstats
path: root/drivers
diff options
context:
space:
mode:
authorMarcin Obara <marcin_obara@users.sourceforge.net>2008-07-10 17:30:42 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2008-07-10 18:04:43 -0700
commitfb0e7e11d017beb5f0b1fa25bc51e49e65c46d67 (patch)
treeb2f4eb4223132e9d91de8a930311a775f17b3f25 /drivers
parente5a5816f7875207cb0a0a7032e39a4686c5e10a4 (diff)
downloadop-kernel-dev-fb0e7e11d017beb5f0b1fa25bc51e49e65c46d67.zip
op-kernel-dev-fb0e7e11d017beb5f0b1fa25bc51e49e65c46d67.tar.gz
tpm: add Intel TPM TIS device HID
This patch adds Intel TPM TIS device HID: ICO0102 Signed-off-by: Marcin Obara <marcin_obara@users.sourceforge.net> Acked-by: Marcel Selhorst <tpm@selhorst.net> Acked-by: Rajiv Andrade <srajiv@linux.vnet.ibm.com> Cc: <stable@kernel.org> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'drivers')
-rw-r--r--drivers/char/tpm/tpm_tis.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/char/tpm/tpm_tis.c b/drivers/char/tpm/tpm_tis.c
index 13a4bdd..c7a977b 100644
--- a/drivers/char/tpm/tpm_tis.c
+++ b/drivers/char/tpm/tpm_tis.c
@@ -623,6 +623,7 @@ static struct pnp_device_id tpm_pnp_tbl[] __devinitdata = {
{"IFX0102", 0}, /* Infineon */
{"BCM0101", 0}, /* Broadcom */
{"NSC1200", 0}, /* National */
+ {"ICO0102", 0}, /* Intel */
/* Add new here */
{"", 0}, /* User Specified */
{"", 0} /* Terminator */
OpenPOWER on IntegriCloud