diff --git a/[refs] b/[refs]
index 0deef90ae550..f098988457d8 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: dbe4ea5fde198a3808e46b665d889818c1e600f5
+refs/heads/master: 2bccc2a89012173f48a690caea7d9e4b3e950db9
diff --git a/trunk/drivers/pcmcia/cs_internal.h b/trunk/drivers/pcmcia/cs_internal.h
index fe7d729cf28b..bca83bbfdbda 100644
--- a/trunk/drivers/pcmcia/cs_internal.h
+++ b/trunk/drivers/pcmcia/cs_internal.h
@@ -130,8 +130,6 @@ struct pcmcia_callback{
 
 int pccard_register_pcmcia(struct pcmcia_socket *s, struct pcmcia_callback *c);
 
-#define cs_socket_name(skt)	((skt)->dev.bus_id)
-
 #ifdef DEBUG
 extern int cs_debug_level(int);