aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/usb/musb/musb_debug.h
diff options
context:
space:
mode:
authorIngo Molnar <mingo@elte.hu>2008-11-20 09:02:39 +0100
committerIngo Molnar <mingo@elte.hu>2008-11-20 09:02:39 +0100
commitfbc2a06056c9aa3cb8c44bf1cfeb1d260e229e5c (patch)
treefeb2a1c13ad3dff5a8c7ab3c0265e8eca7a0c5a3 /drivers/usb/musb/musb_debug.h
parenta3d732f93785da17e0137210deadb4616f5536fc (diff)
parentee2f6cc7f9ea2542ad46070ed62ba7aa04d08871 (diff)
downloadkernel_samsung_smdk4412-fbc2a06056c9aa3cb8c44bf1cfeb1d260e229e5c.zip
kernel_samsung_smdk4412-fbc2a06056c9aa3cb8c44bf1cfeb1d260e229e5c.tar.gz
kernel_samsung_smdk4412-fbc2a06056c9aa3cb8c44bf1cfeb1d260e229e5c.tar.bz2
Merge branch 'linus' into x86/uv
Diffstat (limited to 'drivers/usb/musb/musb_debug.h')
-rw-r--r--drivers/usb/musb/musb_debug.h4
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/usb/musb/musb_debug.h b/drivers/usb/musb/musb_debug.h
index 4d27944..9fc1db4 100644
--- a/drivers/usb/musb/musb_debug.h
+++ b/drivers/usb/musb/musb_debug.h
@@ -48,11 +48,11 @@
__func__, __LINE__ , ## args); \
} } while (0)
-extern unsigned debug;
+extern unsigned musb_debug;
static inline int _dbg_level(unsigned l)
{
- return debug >= l;
+ return musb_debug >= l;
}
#define DBG(level, fmt, args...) xprintk(level, KERN_DEBUG, fmt, ## args)