diff options
| author | Russell King <rmk@dyn-67.arm.linux.org.uk> | 2006-01-07 09:40:05 -0500 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2006-01-07 09:40:05 -0500 |
| commit | 123656d4cc8c946f578ebd18c2050f5251720428 (patch) | |
| tree | 3d5432eff034a3b9cfdc98b37e245abe5695342d /drivers/pcmcia/i82092aa.h | |
| parent | a62c80e559809e6c7851ec04d30575e85ad6f6ed (diff) | |
| parent | 0aec63e67c69545ca757a73a66f5dcf05fa484bf (diff) | |
Merge with Linus' kernel.
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); |