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/at91_cf.c | |
| parent | 2f614fe04f4463ff22234133319067d7361f54e5 (diff) | |
| parent | 53a5fbdc2dff55161a206ed1a1385a8fa8055c34 (diff) | |
| download | kernel_samsung_smdk4412-24fcbacedb0d83cabc6761acbecfbf751265ce52.zip kernel_samsung_smdk4412-24fcbacedb0d83cabc6761acbecfbf751265ce52.tar.gz kernel_samsung_smdk4412-24fcbacedb0d83cabc6761acbecfbf751265ce52.tar.bz2 | |
Merge branch 'master' into upstream-fixes
Diffstat (limited to 'drivers/pcmcia/at91_cf.c')
| -rw-r--r-- | drivers/pcmcia/at91_cf.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/pcmcia/at91_cf.c b/drivers/pcmcia/at91_cf.c index 40569f4..7f5df9a 100644 --- a/drivers/pcmcia/at91_cf.c +++ b/drivers/pcmcia/at91_cf.c @@ -64,9 +64,9 @@ static int at91_cf_ss_init(struct pcmcia_socket *s) return 0; } -static irqreturn_t at91_cf_irq(int irq, void *_cf, struct pt_regs *r) +static irqreturn_t at91_cf_irq(int irq, void *_cf) { - struct at91_cf_socket *cf = (struct at91_cf_socket *) _cf; + struct at91_cf_socket *cf = _cf; if (irq == cf->board->det_pin) { unsigned present = at91_cf_present(cf); |