diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2010-08-06 11:41:17 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2010-08-06 11:41:17 -0700 |
| commit | cc41f5cede3c63836d1c0958204630b07f5b5ee7 (patch) | |
| tree | dfd94451c919b5185d8a01fd3e5a90244fb0de1c /drivers/staging/hv/logging.h | |
| parent | ab69bcd66fb4be64edfc767365cb9eb084961246 (diff) | |
| parent | 9015e4996273c86574d6fd26df8a203941d3cc24 (diff) | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging-2.6
* git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging-2.6: (524 commits)
Staging: wlan-ng: Update prism2_set_tx_power() to use mBm
Staging: ti-st: update TODO
Staging: wlags49_h2: use common PCI_VENDOR/DEVICE_ID name format
Staging: comedi : fix brace coding style issue in wwrap.c
Staging: quatech_usb2: remove unused qt2_box_flush function
Staging: slicoss: Remove net_device_stats from the driver's private
staging: rtl8192su: check whether requests succeeded
staging: panel: fix error path
staging: otus: check kmalloc() return value
staging: octeon: check request_irq() return value
Staging: wlan-ng: remove typedef in p80211hdr.h
Staging: wlan-ng: fix checkpatch issues in headers.
Staging: wlan-ng: remove typedef in p80211ioctl.h
Staging: wlan-ng: fix style issues in p80211conv.h
Staging: wlan-ng: fix style issues for p80211hdr.h
staging: vt6656: removed NTSTATUS definition
staging: vt6656: simplified tests involving both multi/broad-casts
Staging: vt6655: replace BOOL with in kernel bool
Staging: vt6655: replace FALSE with in kernel false
Staging: vt6655: replace TRUE with in kernel true
...
Diffstat (limited to 'drivers/staging/hv/logging.h')
| -rw-r--r-- | drivers/staging/hv/logging.h | 17 |
1 files changed, 0 insertions, 17 deletions
diff --git a/drivers/staging/hv/logging.h b/drivers/staging/hv/logging.h index ad4cfcfb7b11..20d4d12023de 100644 --- a/drivers/staging/hv/logging.h +++ b/drivers/staging/hv/logging.h @@ -92,21 +92,4 @@ extern unsigned int vmbus_loglevel; __func__, ## args);\ } while (0) -#ifdef DEBUG -#define DPRINT_ENTER(mod) do {\ - if ((mod & (HIWORD(vmbus_loglevel))) && \ - (DEBUG_LVL_ENTEREXIT <= LOWORD(vmbus_loglevel))) \ - printk(KERN_DEBUG "["#mod"]: %s() enter\n", __func__);\ - } while (0) - -#define DPRINT_EXIT(mod) do {\ - if ((mod & (HIWORD(vmbus_loglevel))) && \ - (DEBUG_LVL_ENTEREXIT <= LOWORD(vmbus_loglevel))) \ - printk(KERN_DEBUG "["#mod"]: %s() exit\n", __func__);\ - } while (0) -#else -#define DPRINT_ENTER(mod) -#define DPRINT_EXIT(mod) -#endif - #endif /* _LOGGING_H_ */ |