diff options
| author | Russell King <rmk+kernel@arm.linux.org.uk> | 2011-05-26 00:41:21 +0100 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2011-05-26 00:41:21 +0100 |
| commit | ae1d3b974e091b5fc9008bd41bcbdaac68110b62 (patch) | |
| tree | 82e50a66925ced79f59ed4504f6e073ef55edee3 /fs/dlm/config.h | |
| parent | 586893ebc42943008010b4c210cfc9167df615e5 (diff) | |
| parent | 7a2207a0e1142a9b214b323e43ab2ecc592e5b0e (diff) | |
| download | kernel_samsung_tuna-ae1d3b974e091b5fc9008bd41bcbdaac68110b62.zip kernel_samsung_tuna-ae1d3b974e091b5fc9008bd41bcbdaac68110b62.tar.gz kernel_samsung_tuna-ae1d3b974e091b5fc9008bd41bcbdaac68110b62.tar.bz2 | |
Merge branch 'for-rmk' of git://github.com/at91linux/linux-2.6-at91 into devel-stable
Diffstat (limited to 'fs/dlm/config.h')
| -rw-r--r-- | fs/dlm/config.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/fs/dlm/config.h b/fs/dlm/config.h index 4f1d6fc..dd0ce24 100644 --- 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; |