diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2008-06-18 14:55:03 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2008-06-18 14:55:03 -0400 |
| commit | e899536470ec83f2792092640148f2488961731b (patch) | |
| tree | 7ec3ba86c9cd1cc73cca5ff3094524d30db6c44e /fs | |
| parent | d83b14c0db5b238975990c0abda51521120106e9 (diff) | |
| parent | e4f3ec063421bdbcb93330e72aa3eeedb6a0d85a (diff) | |
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.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/udf/udfdecl.h b/fs/udf/udfdecl.h index 8fa9c2d70911..8ec865de5f13 100644 --- a/fs/udf/udfdecl.h +++ b/fs/udf/udfdecl.h | |||
| @@ -16,7 +16,7 @@ | |||
| 16 | #define UDF_PREALLOCATE | 16 | #define UDF_PREALLOCATE |
| 17 | #define UDF_DEFAULT_PREALLOC_BLOCKS 8 | 17 | #define UDF_DEFAULT_PREALLOC_BLOCKS 8 |
| 18 | 18 | ||
| 19 | #define UDFFS_DEBUG | 19 | #undef UDFFS_DEBUG |
| 20 | 20 | ||
| 21 | #ifdef UDFFS_DEBUG | 21 | #ifdef UDFFS_DEBUG |
| 22 | #define udf_debug(f, a...) \ | 22 | #define udf_debug(f, a...) \ |