projects
/
powerpc.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge git://git.infradead.org/~dedekind/ubi-2.6
[powerpc.git]
/
drivers
/
pcmcia
/
cs_internal.h
diff --git
a/drivers/pcmcia/cs_internal.h
b/drivers/pcmcia/cs_internal.h
index
f573ea0
..
9fa207e
100644
(file)
--- a/
drivers/pcmcia/cs_internal.h
+++ b/
drivers/pcmcia/cs_internal.h
@@
-142,7
+142,7
@@
struct pcmcia_callback{
int pccard_register_pcmcia(struct pcmcia_socket *s, struct pcmcia_callback *c);
int pccard_register_pcmcia(struct pcmcia_socket *s, struct pcmcia_callback *c);
-#define cs_socket_name(skt) ((skt)->dev.
clas
s_id)
+#define cs_socket_name(skt) ((skt)->dev.
bu
s_id)
#ifdef DEBUG
extern int cs_debug_level(int);
#ifdef DEBUG
extern int cs_debug_level(int);
@@
-158,6
+158,6
@@
extern int cs_debug_level(int);
#endif
#define cs_err(skt, fmt, arg...) \
#endif
#define cs_err(skt, fmt, arg...) \
- printk(KERN_ERR "cs: %s: " fmt, (skt)->dev.
clas
s_id , ## arg)
+ printk(KERN_ERR "cs: %s: " fmt, (skt)->dev.
bu
s_id , ## arg)
#endif /* _LINUX_CS_INTERNAL_H */
#endif /* _LINUX_CS_INTERNAL_H */