From 5997ca310ac286ade6a7d614f0ddb04ce1100a49 Mon Sep 17 00:00:00 2001 From: Russell King Date: Mon, 19 Jun 2006 15:37:31 +0100 Subject: [PATCH] --- yaml --- r: 28083 b: refs/heads/master c: 5af29e56c221d709bdbd5fccaf190e21f290a30e h: refs/heads/master i: 28081: 1fbf4413e92e9157fbea6cb02d21e637a9eed5b1 28079: 533f65b0ef29cffc4ed14ecaed381f475efbca9c v: v3 --- [refs] | 2 +- trunk/drivers/pcmcia/sa1100_badge4.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index bf5270c34d33..317345bf8251 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 441ff855f3edf5d355bea30f557bbed6bcd42c6c +refs/heads/master: 5af29e56c221d709bdbd5fccaf190e21f290a30e diff --git a/trunk/drivers/pcmcia/sa1100_badge4.c b/trunk/drivers/pcmcia/sa1100_badge4.c index c6b262b653d3..19b1e1276220 100644 --- a/trunk/drivers/pcmcia/sa1100_badge4.c +++ b/trunk/drivers/pcmcia/sa1100_badge4.c @@ -128,8 +128,8 @@ badge4_pcmcia_configure_socket(struct soc_pcmcia_socket *skt, const socket_state static struct pcmcia_low_level badge4_pcmcia_ops = { .owner = THIS_MODULE, - .init = sa1111_pcmcia_hw_init, - .shutdown = sa1111_pcmcia_hw_shutdown, + .hw_init = sa1111_pcmcia_hw_init, + .hw_shutdown = sa1111_pcmcia_hw_shutdown, .socket_state = sa1111_pcmcia_socket_state, .configure_socket = badge4_pcmcia_configure_socket,