git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'linus' into cpus4096
[pandora-kernel.git]
/
drivers
/
char
/
tpm
/
tpm_tis.c
diff --git
a/drivers/char/tpm/tpm_tis.c
b/drivers/char/tpm/tpm_tis.c
index
81503d9
..
c7a977b
100644
(file)
--- a/
drivers/char/tpm/tpm_tis.c
+++ b/
drivers/char/tpm/tpm_tis.c
@@
-399,7
+399,7
@@
static irqreturn_t tis_int_probe(int irq, void *dev_id)
return IRQ_HANDLED;
}
return IRQ_HANDLED;
}
-static irqreturn_t tis_int_handler(int
irq
, void *dev_id)
+static irqreturn_t tis_int_handler(int
dummy
, void *dev_id)
{
struct tpm_chip *chip = dev_id;
u32 interrupt;
{
struct tpm_chip *chip = dev_id;
u32 interrupt;
@@
-623,6
+623,7
@@
static struct pnp_device_id tpm_pnp_tbl[] __devinitdata = {
{"IFX0102", 0}, /* Infineon */
{"BCM0101", 0}, /* Broadcom */
{"NSC1200", 0}, /* National */
{"IFX0102", 0}, /* Infineon */
{"BCM0101", 0}, /* Broadcom */
{"NSC1200", 0}, /* National */
+ {"ICO0102", 0}, /* Intel */
/* Add new here */
{"", 0}, /* User Specified */
{"", 0} /* Terminator */
/* Add new here */
{"", 0}, /* User Specified */
{"", 0} /* Terminator */