summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRussell King <rmk@dyn-67.arm.linux.org.uk>2006-06-19 16:37:31 +0200
committerRussell King <rmk+kernel@arm.linux.org.uk>2006-06-19 16:37:31 +0200
commit5af29e56c221d709bdbd5fccaf190e21f290a30e (patch)
tree03c48002fd45ea4479345a9cf89b0e442305e1db
parent[ARM] Fix byte order macros for Thumb (diff)
downloadlinux-5af29e56c221d709bdbd5fccaf190e21f290a30e.tar.xz
linux-5af29e56c221d709bdbd5fccaf190e21f290a30e.zip
[ARM] Fix badge4 build error
The Badge4 PCMCIA driver was referencing structure elements which had been renamed. Fix the missing renames. Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
-rw-r--r--drivers/pcmcia/sa1100_badge4.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/pcmcia/sa1100_badge4.c b/drivers/pcmcia/sa1100_badge4.c
index c6b262b653d3..19b1e1276220 100644
--- a/drivers/pcmcia/sa1100_badge4.c
+++ b/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,