diff options
| author | Jeff Garzik <jeff@garzik.org> | 2006-10-11 03:56:12 -0400 |
|---|---|---|
| committer | Jeff Garzik <jeff@garzik.org> | 2006-10-11 03:56:12 -0400 |
| commit | 24fcbacedb0d83cabc6761acbecfbf751265ce52 (patch) | |
| tree | 7147b206304b028c3cfd5de6317e5c8510098ca9 /drivers/pcmcia/soc_common.c | |
| parent | 2f614fe04f4463ff22234133319067d7361f54e5 (diff) | |
| parent | 53a5fbdc2dff55161a206ed1a1385a8fa8055c34 (diff) | |
Merge branch 'master' into upstream-fixes
Diffstat (limited to 'drivers/pcmcia/soc_common.c')
| -rw-r--r-- | drivers/pcmcia/soc_common.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/pcmcia/soc_common.c b/drivers/pcmcia/soc_common.c index ecaa132fa592..3627e52e0c27 100644 --- a/drivers/pcmcia/soc_common.c +++ b/drivers/pcmcia/soc_common.c | |||
| @@ -256,7 +256,7 @@ static void soc_common_pcmcia_poll_event(unsigned long dummy) | |||
| 256 | * handling code performs scheduling operations which cannot be | 256 | * handling code performs scheduling operations which cannot be |
| 257 | * executed from within an interrupt context. | 257 | * executed from within an interrupt context. |
| 258 | */ | 258 | */ |
| 259 | static irqreturn_t soc_common_pcmcia_interrupt(int irq, void *dev, struct pt_regs *regs) | 259 | static irqreturn_t soc_common_pcmcia_interrupt(int irq, void *dev) |
| 260 | { | 260 | { |
| 261 | struct soc_pcmcia_socket *skt = dev; | 261 | struct soc_pcmcia_socket *skt = dev; |
| 262 | 262 | ||