diff options
| author | Jody McIntyre <scjody@modernduck.com> | 2006-01-05 22:22:50 -0500 |
|---|---|---|
| committer | Jody McIntyre <scjody@modernduck.com> | 2006-01-05 22:22:50 -0500 |
| commit | 52cab57873c25d3c8324ee3e4d463db6e8e73fd7 (patch) | |
| tree | 826cb36827afa363944e6478d19512e669446c64 /drivers/pcmcia/i82092aa.h | |
| parent | 0a75c23a009ff65f651532cecc16675d05f4de37 (diff) | |
| parent | 46f25dffbaba48c571d75f5f574f31978287b8d2 (diff) | |
Merge with http://kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6.git
Diffstat (limited to 'drivers/pcmcia/i82092aa.h')
| -rw-r--r-- | drivers/pcmcia/i82092aa.h | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/drivers/pcmcia/i82092aa.h b/drivers/pcmcia/i82092aa.h index b98cac7bda9f..9c14599d0673 100644 --- a/drivers/pcmcia/i82092aa.h +++ b/drivers/pcmcia/i82092aa.h | |||
| @@ -29,7 +29,6 @@ static irqreturn_t i82092aa_interrupt(int irq, void *dev, struct pt_regs *regs); | |||
| 29 | 29 | ||
| 30 | 30 | ||
| 31 | static int i82092aa_get_status(struct pcmcia_socket *socket, u_int *value); | 31 | static int i82092aa_get_status(struct pcmcia_socket *socket, u_int *value); |
| 32 | static int i82092aa_get_socket(struct pcmcia_socket *socket, socket_state_t *state); | ||
| 33 | static int i82092aa_set_socket(struct pcmcia_socket *socket, socket_state_t *state); | 32 | static int i82092aa_set_socket(struct pcmcia_socket *socket, socket_state_t *state); |
| 34 | static int i82092aa_set_io_map(struct pcmcia_socket *socket, struct pccard_io_map *io); | 33 | static int i82092aa_set_io_map(struct pcmcia_socket *socket, struct pccard_io_map *io); |
| 35 | static int i82092aa_set_mem_map(struct pcmcia_socket *socket, struct pccard_mem_map *mem); | 34 | static int i82092aa_set_mem_map(struct pcmcia_socket *socket, struct pccard_mem_map *mem); |