diff options
| author | Jeff Garzik <jeff@garzik.org> | 2006-10-06 15:27:31 -0400 |
|---|---|---|
| committer | Jeff Garzik <jeff@garzik.org> | 2006-10-06 15:27:31 -0400 |
| commit | 5d347c8abaab1e8c24272a53099c22482855783e (patch) | |
| tree | 3e267ced787b4ae18dd2c6275c1b8a83884f96b6 /drivers/pcmcia/at91_cf.c | |
| parent | e317c8ccaaf900abf39cc3240e4dc5ba82a3cc67 (diff) | |
| parent | d87dbede030d17770aa6a6170e70ab6f8044e5ae (diff) | |
Merge branch 'submit1' of viper:/spare/repo/irq-remove-2.6 into irqcleanups
Diffstat (limited to 'drivers/pcmcia/at91_cf.c')
| -rw-r--r-- | drivers/pcmcia/at91_cf.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/pcmcia/at91_cf.c b/drivers/pcmcia/at91_cf.c index 991e084db2d6..7f5df9a9f393 100644 --- a/drivers/pcmcia/at91_cf.c +++ b/drivers/pcmcia/at91_cf.c | |||
| @@ -66,7 +66,7 @@ static int at91_cf_ss_init(struct pcmcia_socket *s) | |||
| 66 | 66 | ||
| 67 | static irqreturn_t at91_cf_irq(int irq, void *_cf) | 67 | static irqreturn_t at91_cf_irq(int irq, void *_cf) |
| 68 | { | 68 | { |
| 69 | struct at91_cf_socket *cf = (struct at91_cf_socket *) _cf; | 69 | struct at91_cf_socket *cf = _cf; |
| 70 | 70 | ||
| 71 | if (irq == cf->board->det_pin) { | 71 | if (irq == cf->board->det_pin) { |
| 72 | unsigned present = at91_cf_present(cf); | 72 | unsigned present = at91_cf_present(cf); |