diff options
| author | Glenn Elliott <gelliott@cs.unc.edu> | 2012-03-04 19:47:13 -0500 |
|---|---|---|
| committer | Glenn Elliott <gelliott@cs.unc.edu> | 2012-03-04 19:47:13 -0500 |
| commit | c71c03bda1e86c9d5198c5d83f712e695c4f2a1e (patch) | |
| tree | ecb166cb3e2b7e2adb3b5e292245fefd23381ac8 /sound/usb/debug.h | |
| parent | ea53c912f8a86a8567697115b6a0d8152beee5c8 (diff) | |
| parent | 6a00f206debf8a5c8899055726ad127dbeeed098 (diff) | |
Merge branch 'mpi-master' into wip-k-fmlpwip-k-fmlp
Conflicts:
litmus/sched_cedf.c
Diffstat (limited to 'sound/usb/debug.h')
| -rw-r--r-- | sound/usb/debug.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sound/usb/debug.h b/sound/usb/debug.h index 343ec2d9ee66..58030176f008 100644 --- a/sound/usb/debug.h +++ b/sound/usb/debug.h | |||
| @@ -8,7 +8,7 @@ | |||
| 8 | #ifdef HW_CONST_DEBUG | 8 | #ifdef HW_CONST_DEBUG |
| 9 | #define hwc_debug(fmt, args...) printk(KERN_DEBUG fmt, ##args) | 9 | #define hwc_debug(fmt, args...) printk(KERN_DEBUG fmt, ##args) |
| 10 | #else | 10 | #else |
| 11 | #define hwc_debug(fmt, args...) /**/ | 11 | #define hwc_debug(fmt, args...) do { } while(0) |
| 12 | #endif | 12 | #endif |
| 13 | 13 | ||
| 14 | #endif /* __USBAUDIO_DEBUG_H */ | 14 | #endif /* __USBAUDIO_DEBUG_H */ |