diff --git a/[refs] b/[refs] index efea87d30266..058e54e080ee 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: ced69090c573f1db253fb6b84ec537f4f3d7e2f4 +refs/heads/master: 03801553630c4bec6682108800c9b2de64bdbd37 diff --git a/trunk/fs/ntfs/debug.h b/trunk/fs/ntfs/debug.h index 5e6724c1afd1..2142b1c68b61 100644 --- a/trunk/fs/ntfs/debug.h +++ b/trunk/fs/ntfs/debug.h @@ -30,7 +30,8 @@ extern int debug_msgs; -#if 0 /* Fool kernel-doc since it doesn't do macros yet */ +extern void __ntfs_debug(const char *file, int line, const char *function, + const char *format, ...) __attribute__ ((format (printf, 4, 5))); /** * ntfs_debug - write a debug level message to syslog * @f: a printf format string containing the message @@ -39,11 +40,6 @@ extern int debug_msgs; * ntfs_debug() writes a DEBUG level message to the syslog but only if the * driver was compiled with -DDEBUG. Otherwise, the call turns into a NOP. */ -static void ntfs_debug(const char *f, ...); -#endif - -extern void __ntfs_debug (const char *file, int line, const char *function, - const char *format, ...) __attribute__ ((format (printf, 4, 5))); #define ntfs_debug(f, a...) \ __ntfs_debug(__FILE__, __LINE__, __func__, f, ##a)