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/i82092aa.h | |
| parent | 2f614fe04f4463ff22234133319067d7361f54e5 (diff) | |
| parent | 53a5fbdc2dff55161a206ed1a1385a8fa8055c34 (diff) | |
Merge branch 'master' into upstream-fixes
Diffstat (limited to 'drivers/pcmcia/i82092aa.h')
| -rw-r--r-- | drivers/pcmcia/i82092aa.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/pcmcia/i82092aa.h b/drivers/pcmcia/i82092aa.h index 9c14599d0673..b0d453303c5d 100644 --- a/drivers/pcmcia/i82092aa.h +++ b/drivers/pcmcia/i82092aa.h | |||
| @@ -23,7 +23,7 @@ | |||
| 23 | static int i82092aa_pci_probe(struct pci_dev *dev, const struct pci_device_id *id); | 23 | static int i82092aa_pci_probe(struct pci_dev *dev, const struct pci_device_id *id); |
| 24 | static void i82092aa_pci_remove(struct pci_dev *dev); | 24 | static void i82092aa_pci_remove(struct pci_dev *dev); |
| 25 | static int card_present(int socketno); | 25 | static int card_present(int socketno); |
| 26 | static irqreturn_t i82092aa_interrupt(int irq, void *dev, struct pt_regs *regs); | 26 | static irqreturn_t i82092aa_interrupt(int irq, void *dev); |
| 27 | 27 | ||
| 28 | 28 | ||
| 29 | 29 | ||