summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLE DISEZ Erwan <eledisez@grounation.org>2008-07-26 04:44:56 +0200
committerLinus Torvalds <torvalds@linux-foundation.org>2008-07-26 21:00:03 +0200
commit061991ec6edceda48d60f7a53e17b8d3416266ae (patch)
tree9d0c9640bfb9c924570a5a0ec57b15114832a6b7
parentparport_pc: add base_hi BAR for oxsemi_840 (diff)
downloadlinux-061991ec6edceda48d60f7a53e17b8d3416266ae.tar.xz
linux-061991ec6edceda48d60f7a53e17b8d3416266ae.zip
tpm: add support for Broadcom TPM TIS device HID
Signed-off-by: Rajiv Andrade <srajiv@linux.vnet.ibm.com> Cc: Marcel Selhorst <tpm@selhorst.net> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
-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 c7a977bc03e8..ed1879c0dd8d 100644
--- a/drivers/char/tpm/tpm_tis.c
+++ b/drivers/char/tpm/tpm_tis.c
@@ -622,6 +622,7 @@ static struct pnp_device_id tpm_pnp_tbl[] __devinitdata = {
{"ATM1200", 0}, /* Atmel */
{"IFX0102", 0}, /* Infineon */
{"BCM0101", 0}, /* Broadcom */
+ {"BCM0102", 0}, /* Broadcom */
{"NSC1200", 0}, /* National */
{"ICO0102", 0}, /* Intel */
/* Add new here */