diff --git a/[refs] b/[refs] index 712230c4d8b1..931e70f10fc7 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: e4115805cf2020da94e8bd1296243605cda487ff +refs/heads/master: 7f316b033b36adfbdf56bfb15c13de49798ab0b2 diff --git a/trunk/include/pcmcia/ss.h b/trunk/include/pcmcia/ss.h index e788bbc5657d..25e6bf05e25c 100644 --- a/trunk/include/pcmcia/ss.h +++ b/trunk/include/pcmcia/ss.h @@ -118,7 +118,6 @@ struct pcmcia_socket; struct pccard_operations { int (*init)(struct pcmcia_socket *sock); int (*suspend)(struct pcmcia_socket *sock); - int (*register_callback)(struct pcmcia_socket *sock, void (*handler)(void *, unsigned int), void * info); int (*get_status)(struct pcmcia_socket *sock, u_int *value); int (*get_socket)(struct pcmcia_socket *sock, socket_state_t *state); int (*set_socket)(struct pcmcia_socket *sock, socket_state_t *state);