diff options
| author | Lachlan McIlroy <lachlan@redback.melbourne.sgi.com> | 2009-01-14 00:29:51 -0500 |
|---|---|---|
| committer | Lachlan McIlroy <lachlan@redback.melbourne.sgi.com> | 2009-01-14 00:29:51 -0500 |
| commit | cb7a97d01521797cad9f63e8478403c3e51fea49 (patch) | |
| tree | 84cddf20369f82f10c1c3712e6cce20dd1b9d863 /fs/coda/sysctl.c | |
| parent | 0335cb76aa3fa913a2164bc9b669e5aef9d56fa3 (diff) | |
| parent | a6525042bfdfcab128bd91fad264de10fd24a55e (diff) | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6 into for-linus
Diffstat (limited to 'fs/coda/sysctl.c')
| -rw-r--r-- | fs/coda/sysctl.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/fs/coda/sysctl.c b/fs/coda/sysctl.c index 81b7771c6465..43c96ce29614 100644 --- a/fs/coda/sysctl.c +++ b/fs/coda/sysctl.c | |||
| @@ -11,7 +11,9 @@ | |||
| 11 | 11 | ||
| 12 | #include "coda_int.h" | 12 | #include "coda_int.h" |
| 13 | 13 | ||
| 14 | #ifdef CONFIG_SYSCTL | ||
| 14 | static struct ctl_table_header *fs_table_header; | 15 | static struct ctl_table_header *fs_table_header; |
| 16 | #endif | ||
| 15 | 17 | ||
| 16 | static ctl_table coda_table[] = { | 18 | static ctl_table coda_table[] = { |
| 17 | { | 19 | { |
| @@ -41,6 +43,7 @@ static ctl_table coda_table[] = { | |||
| 41 | {} | 43 | {} |
| 42 | }; | 44 | }; |
| 43 | 45 | ||
| 46 | #ifdef CONFIG_SYSCTL | ||
| 44 | static ctl_table fs_table[] = { | 47 | static ctl_table fs_table[] = { |
| 45 | { | 48 | { |
| 46 | .ctl_name = CTL_UNNUMBERED, | 49 | .ctl_name = CTL_UNNUMBERED, |
| @@ -50,7 +53,7 @@ static ctl_table fs_table[] = { | |||
| 50 | }, | 53 | }, |
| 51 | {} | 54 | {} |
| 52 | }; | 55 | }; |
| 53 | 56 | #endif | |
| 54 | 57 | ||
| 55 | void coda_sysctl_init(void) | 58 | void coda_sysctl_init(void) |
| 56 | { | 59 | { |