diff options
author | Ralf Baechle <ralf@linux-mips.org> | 2000-06-15 01:55:58 +0000 |
---|---|---|
committer | Ralf Baechle <ralf@linux-mips.org> | 2000-06-15 01:55:58 +0000 |
commit | 53b3988d474435254a3b053a68bb24ce9e439295 (patch) | |
tree | f8da8e40f01f4ad02bbd76b8c9920749b118235f /drivers/pcmcia | |
parent | b0cb48abe83d1a4389ea938bf624f8baa82c5047 (diff) |
Merge with 2.3.99-pre9.
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 857e8f043..9ce07690b 100644 --- a/drivers/pcmcia/yenta.c +++ b/drivers/pcmcia/yenta.c @@ -564,7 +564,7 @@ static void yenta_clear_maps(pci_socket_t *socket) */ static void yenta_power_sense(pci_socket_t *socket) { - u32 status = config_readl(socket, CB_SOCKET_STATE); + u32 status = cb_readl(socket, CB_SOCKET_STATE); /* * Nothing inserted, nothing to sense.. |