git://git.onelab.eu
/
linux-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
fedora core 6 1.2949 + vserver 2.2.0
[linux-2.6.git]
/
drivers
/
char
/
tpm
/
tpm_tis.c
diff --git
a/drivers/char/tpm/tpm_tis.c
b/drivers/char/tpm/tpm_tis.c
index
ee7ac6f
..
483f3f6
100644
(file)
--- a/
drivers/char/tpm/tpm_tis.c
+++ b/
drivers/char/tpm/tpm_tis.c
@@
-377,7
+377,7
@@
static struct tpm_vendor_specific tpm_tis = {
.fops = &tis_ops,},
};
.fops = &tis_ops,},
};
-static irqreturn_t tis_int_probe(int irq, void *dev_id
, struct pt_regs *regs
)
+static irqreturn_t tis_int_probe(int irq, void *dev_id)
{
struct tpm_chip *chip = (struct tpm_chip *) dev_id;
u32 interrupt;
{
struct tpm_chip *chip = (struct tpm_chip *) dev_id;
u32 interrupt;
@@
-397,7
+397,7
@@
static irqreturn_t tis_int_probe(int irq, void *dev_id, struct pt_regs *regs)
return IRQ_HANDLED;
}
return IRQ_HANDLED;
}
-static irqreturn_t tis_int_handler(int irq, void *dev_id
, struct pt_regs *regs
)
+static irqreturn_t tis_int_handler(int irq, void *dev_id)
{
struct tpm_chip *chip = (struct tpm_chip *) dev_id;
u32 interrupt;
{
struct tpm_chip *chip = (struct tpm_chip *) dev_id;
u32 interrupt;