]> pilppa.com Git - linux-2.6-omap-h63xx.git/commitdiff
tpm: add Intel TPM TIS device HID
authorMarcin Obara <marcin_obara@users.sourceforge.net>
Fri, 11 Jul 2008 00:30:42 +0000 (17:30 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Fri, 11 Jul 2008 01:04:43 +0000 (18:04 -0700)
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>
drivers/char/tpm/tpm_tis.c

index 13a4bdd4e4d67ff73535cd6b1cb4dece7e3aba65..c7a977bc03e81e2b1f38830c62b2034672065538 100644 (file)
@@ -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 */