]> err.no Git - linux-2.6/commitdiff
[ARM] Fix badge4 build error
authorRussell King <rmk@dyn-67.arm.linux.org.uk>
Mon, 19 Jun 2006 14:37:31 +0000 (15:37 +0100)
committerRussell King <rmk+kernel@arm.linux.org.uk>
Mon, 19 Jun 2006 14:37:31 +0000 (15:37 +0100)
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>
drivers/pcmcia/sa1100_badge4.c

index c6b262b653d3e7f7eb97af7206980da141d3965e..19b1e127622060dc9a0eacff062f0ec9c2bd852e 100644 (file)
@@ -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,