diff options
| author | Daniel Vetter <daniel.vetter@ffwll.ch> | 2015-01-12 17:07:46 -0500 |
|---|---|---|
| committer | Daniel Vetter <daniel.vetter@ffwll.ch> | 2015-01-12 17:07:46 -0500 |
| commit | 0a87a2db485a1456b7427914969c0e8195a1bbda (patch) | |
| tree | 8d0186672af22c6ee76118c471881cd66a36502d /include/uapi/linux/nfsd/debug.h | |
| parent | 7226572d8ed48f7e1aa9de5383d919490d6e9a0c (diff) | |
| parent | fcf3aac5fc307f0cae429f5844ddc25761662858 (diff) | |
Merge tag 'topic/i915-hda-componentized-2015-01-12' into drm-intel-next-queued
Conflicts:
drivers/gpu/drm/i915/intel_runtime_pm.c
Separate branch so that Takashi can also pull just this refactoring
into sound-next.
Signed-off-by: Daniel Vetter <daniel.vetter@intel.com>
Diffstat (limited to 'include/uapi/linux/nfsd/debug.h')
| -rw-r--r-- | include/uapi/linux/nfsd/debug.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/uapi/linux/nfsd/debug.h b/include/uapi/linux/nfsd/debug.h index a6f453c740b8..1fdc95bb2375 100644 --- a/include/uapi/linux/nfsd/debug.h +++ b/include/uapi/linux/nfsd/debug.h | |||
| @@ -15,7 +15,7 @@ | |||
| 15 | * Enable debugging for nfsd. | 15 | * Enable debugging for nfsd. |
| 16 | * Requires RPC_DEBUG. | 16 | * Requires RPC_DEBUG. |
| 17 | */ | 17 | */ |
| 18 | #ifdef RPC_DEBUG | 18 | #if IS_ENABLED(CONFIG_SUNRPC_DEBUG) |
| 19 | # define NFSD_DEBUG 1 | 19 | # define NFSD_DEBUG 1 |
| 20 | #endif | 20 | #endif |
| 21 | 21 | ||