Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit fb0e7e11 authored Jul 10, 2008 by Marcin Obara Committed by Linus Torvalds Jul 10, 2008

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>

parent e5a5816f

drivers/char/tpm/tpm_tis.c

+1 −0

Original line number	Original line	Diff line number	Diff line
	@@ -623,6 +623,7 @@ static struct pnp_device_id tpm_pnp_tbl[] __devinitdata = {
	{"IFX0102", 0}, /* Infineon */		{"IFX0102", 0}, /* Infineon */
	{"BCM0101", 0}, /* Broadcom */		{"BCM0101", 0}, /* Broadcom */
	{"NSC1200", 0}, /* National */		{"NSC1200", 0}, /* National */
			{"ICO0102", 0}, /* Intel */
	/* Add new here */		/* Add new here */
	{"", 0}, /* User Specified */		{"", 0}, /* User Specified */
	{"", 0} /* Terminator */		{"", 0} /* Terminator */