Merge branch 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux-2.6

[linux-2.6-omap-h63xx.git] / fs / dlm / config.h

diff --git a/fs/dlm/config.h b/fs/dlm/config.h
index 967cc3d72e5e844a893eb2aab1bf7e23ef966fb3..a3170fe22090589198b21dd6cb7476ff397229ca 100644 (file)
--- a/fs/dlm/config.h
+++ b/fs/dlm/config.h
@@ -27,6 +27,7 @@ struct dlm_config_info {
        int ci_scan_secs;
        int ci_log_debug;
        int ci_protocol;
+       int ci_timewarn_cs;
 };
 
 extern struct dlm_config_info dlm_config;