Merge bk://bk.arm.linux.org.uk/linux-2.6-rmk

into home.osdl.org:/home/torvalds/v2.5/linux

drivers/pcmcia/cs.c

@@ -479,9 +479,9 @@ static void shutdown_socket(struct pcmcia_socket *s)
 
     {
 	int status;
-	skt->ops->get_status(skt, &status);
+	s->ops->get_status(s, &status);
 	if (status & SS_POWERON) {
-		printk(KERN_ERR "PCMCIA: socket %p: *** DANGER *** unable to remove socket power\n", skt);
+		printk(KERN_ERR "PCMCIA: socket %p: *** DANGER *** unable to remove socket power\n", s);
 	}
     }
 } /* shutdown_socket */