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

Linus Torvalds · Linus Torvalds · commit 14dc8b59cbf2 · 2003-10-05T05:01:59.000-07:00
into home.osdl.org:/home/torvalds/v2.5/linux
diff --git a/drivers/pcmcia/cs.c b/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 */

Original file line number	Diff line number	Diff line change
`@@ -479,9 +479,9 @@ static void shutdown_socket(struct pcmcia_socket *s)`
`479`	`479`
`480`	`480`	`{`
`481`	`481`	`int status;`
`482`		`- skt->ops->get_status(skt, &status);`
	`482`	`+ s->ops->get_status(s, &status);`
`483`	`483`	`if (status & SS_POWERON) {`
`484`		`- printk(KERN_ERR "PCMCIA: socket %p: * DANGER * unable to remove socket power\n", skt);`
	`484`	`+ printk(KERN_ERR "PCMCIA: socket %p: * DANGER * unable to remove socket power\n", s);`
`485`	`485`	`}`
`486`	`486`	`}`
`487`	`487`	`} /* shutdown_socket */`