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
/
pcmcia
/
vrc4171_card.c
diff --git
a/drivers/pcmcia/vrc4171_card.c
b/drivers/pcmcia/vrc4171_card.c
index
459e6e1
..
e90d8e8
100644
(file)
--- a/
drivers/pcmcia/vrc4171_card.c
+++ b/
drivers/pcmcia/vrc4171_card.c
@@
-514,7
+514,7
@@
static inline unsigned int get_events(int slot)
return events;
}
return events;
}
-static irqreturn_t pccard_interrupt(int irq, void *dev_id
, struct pt_regs *regs
)
+static irqreturn_t pccard_interrupt(int irq, void *dev_id)
{
vrc4171_socket_t *socket;
unsigned int events;
{
vrc4171_socket_t *socket;
unsigned int events;
@@
-730,7
+730,7
@@
static int __devinit vrc4171_card_init(void)
retval = vrc4171_add_sockets();
if (retval == 0)
retval = vrc4171_add_sockets();
if (retval == 0)
- retval = request_irq(vrc4171_irq, pccard_interrupt,
SA_SHIRQ
,
+ retval = request_irq(vrc4171_irq, pccard_interrupt,
IRQF_SHARED
,
vrc4171_card_name, vrc4171_sockets);
if (retval < 0) {
vrc4171_card_name, vrc4171_sockets);
if (retval < 0) {