diff options
| author | Ralf Baechle <ralf@linux-mips.org> | 2000-07-28 23:18:56 +0000 |
|---|---|---|
| committer | Ralf Baechle <ralf@linux-mips.org> | 2000-07-28 23:18:56 +0000 |
| commit | 4d657aa39d5bcae60c2c11bf8fb66692ddd1c9e7 (patch) | |
| tree | 30f3b08741a4d4b98b16bd99ea2757ff715d1c11 /drivers/pcmcia | |
| parent | eed6b7c84cc33f229f6fecd884d9a22af5bec514 (diff) | |
Merge with 2.4.0-test5 final.
Diffstat (limited to 'drivers/pcmcia')
| -rw-r--r-- | drivers/pcmcia/yenta.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/pcmcia/yenta.c b/drivers/pcmcia/yenta.c index 0556c7906..6b0a9e1ae 100644 --- a/drivers/pcmcia/yenta.c +++ b/drivers/pcmcia/yenta.c @@ -596,7 +596,7 @@ static void yenta_clear_maps(pci_socket_t *socket) /* * Initialize the standard cardbus registers */ -static int yenta_config_init(pci_socket_t *socket) +static void yenta_config_init(pci_socket_t *socket) { u16 bridge; struct pci_dev *dev = socket->dev; |