diff options
| author | Stefan Richter <stefanr@s5r6.in-berlin.de> | 2011-05-10 14:52:07 -0400 |
|---|---|---|
| committer | Stefan Richter <stefanr@s5r6.in-berlin.de> | 2011-05-10 16:50:41 -0400 |
| commit | 020abf03cd659388f94cb328e1e1df0656e0d7ff (patch) | |
| tree | 40d05011708ad1b4a05928d167eb120420581aa6 /include/linux/lockd/debug.h | |
| parent | 0ff8fbc61727c926883eec381fbd3d32d1fab504 (diff) | |
| parent | 693d92a1bbc9e42681c42ed190bd42b636ca876f (diff) | |
Merge tag 'v2.6.39-rc7'
in order to pull in changes in drivers/media/dvb/firewire/ and
sound/firewire/.
Diffstat (limited to 'include/linux/lockd/debug.h')
| -rw-r--r-- | include/linux/lockd/debug.h | 10 |
1 files changed, 0 insertions, 10 deletions
diff --git a/include/linux/lockd/debug.h b/include/linux/lockd/debug.h index 34b2b7f33c3b..257d3779f2ab 100644 --- a/include/linux/lockd/debug.h +++ b/include/linux/lockd/debug.h | |||
| @@ -44,14 +44,4 @@ | |||
| 44 | #define NLMDBG_XDR 0x0100 | 44 | #define NLMDBG_XDR 0x0100 |
| 45 | #define NLMDBG_ALL 0x7fff | 45 | #define NLMDBG_ALL 0x7fff |
| 46 | 46 | ||
| 47 | |||
| 48 | /* | ||
| 49 | * Support for printing NLM cookies in dprintk() | ||
| 50 | */ | ||
| 51 | #ifdef RPC_DEBUG | ||
| 52 | struct nlm_cookie; | ||
| 53 | /* Call this function with the BKL held (it uses a static buffer) */ | ||
| 54 | extern const char *nlmdbg_cookie2a(const struct nlm_cookie *); | ||
| 55 | #endif | ||
| 56 | |||
| 57 | #endif /* LINUX_LOCKD_DEBUG_H */ | 47 | #endif /* LINUX_LOCKD_DEBUG_H */ |