[PATCH] Fix PCMCIA duplicate pc_debug names

Avoid naming confusion concerning "pc_debug" which is widely used by drivers
be renaming the PCMCIA "driver services" variant to ds_pc_debug. The module
parameter stays the same, thanks to module_param_named().
Signed-off-by: Dominik Brodowski <linux@dominikbrodowski.de>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

drivers/pcmcia/bulkmem.c

@@ -49,11 +49,11 @@
 #include "cs_internal.h"
 
 #ifdef DEBUG
-extern int pc_debug;
+extern int ds_pc_debug;
 #define cs_socket_name(skt)	((skt)->dev.class_id)
 
 #define ds_dbg(skt, lvl, fmt, arg...) do {		\
-	if (pc_debug >= lvl)				\
+	if (ds_pc_debug >= lvl)				\
 		printk(KERN_DEBUG "ds: %s: " fmt, 	\
 		       cs_socket_name(skt) , ## arg);	\
 } while (0)

drivers/pcmcia/ds.c

@@ -75,12 +75,12 @@ MODULE_DESCRIPTION("PCMCIA Driver Services");
 MODULE_LICENSE("Dual MPL/GPL");
 
 #ifdef DEBUG
-int pc_debug;
+int ds_pc_debug;
 
-module_param(pc_debug, int, 0644);
+module_param_named(pc_debug, ds_pc_debug, int, 0644);
 
 #define ds_dbg(lvl, fmt, arg...) do {				\
-	if (pc_debug > (lvl))					\
+	if (ds_pc_debug > (lvl))					\
 		printk(KERN_DEBUG "ds: " fmt , ## arg);		\
 } while (0)
 #else