[PATCH] pcmcia: merge struct pcmcia_bus_socket into struct pcmcia_socket