git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'for-torvalds' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw...
[pandora-kernel.git]
/
fs
/
dlm
/
config.h
diff --git
a/fs/dlm/config.h
b/fs/dlm/config.h
index
4f1d6fc
..
dd0ce24
100644
(file)
--- a/
fs/dlm/config.h
+++ b/
fs/dlm/config.h
@@
-28,6
+28,7
@@
struct dlm_config_info {
int ci_log_debug;
int ci_protocol;
int ci_timewarn_cs;
+ int ci_waitwarn_us;
};
extern struct dlm_config_info dlm_config;