summaryrefslogtreecommitdiff
path: root/fs
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2008-06-18 11:55:03 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2008-06-18 11:55:03 -0700
commite899536470ec83f2792092640148f2488961731b (patch)
tree7ec3ba86c9cd1cc73cca5ff3094524d30db6c44e /fs
parentd83b14c0db5b238975990c0abda51521120106e9 (diff)
parente4f3ec063421bdbcb93330e72aa3eeedb6a0d85a (diff)
downloadlinux-3.10-e899536470ec83f2792092640148f2488961731b.tar.gz
linux-3.10-e899536470ec83f2792092640148f2488961731b.tar.bz2
linux-3.10-e899536470ec83f2792092640148f2488961731b.zip
Merge branch 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jack/linux-udf-2.6
* 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jack/linux-udf-2.6: udf: restore UDFFS_DEBUG to being undefined by default
Diffstat (limited to 'fs')
-rw-r--r--fs/udf/udfdecl.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/udf/udfdecl.h b/fs/udf/udfdecl.h
index 8fa9c2d7091..8ec865de5f1 100644
--- a/fs/udf/udfdecl.h
+++ b/fs/udf/udfdecl.h
@@ -16,7 +16,7 @@
#define UDF_PREALLOCATE
#define UDF_DEFAULT_PREALLOC_BLOCKS 8
-#define UDFFS_DEBUG
+#undef UDFFS_DEBUG
#ifdef UDFFS_DEBUG
#define udf_debug(f, a...) \