From 288bba3b5940e723d74805787a73050817b96d1c Mon Sep 17 00:00:00 2001 From: Marcin Obara Date: Thu, 10 Jul 2008 17:30:42 -0700 Subject: [PATCH] --- yaml --- r: 98845 b: refs/heads/master c: fb0e7e11d017beb5f0b1fa25bc51e49e65c46d67 h: refs/heads/master i: 98843: a3ceacfa682b47838e8d6fa9d9c04b1167779bc5 v: v3 --- [refs] | 2 +- trunk/drivers/char/tpm/tpm_tis.c | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/[refs] b/[refs] index 8c07d5e23b01..e5eb90b74fd2 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: e5a5816f7875207cb0a0a7032e39a4686c5e10a4 +refs/heads/master: fb0e7e11d017beb5f0b1fa25bc51e49e65c46d67 diff --git a/trunk/drivers/char/tpm/tpm_tis.c b/trunk/drivers/char/tpm/tpm_tis.c index 13a4bdd4e4d6..c7a977bc03e8 100644 --- a/trunk/drivers/char/tpm/tpm_tis.c +++ b/trunk/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 */