diff options
| author | Adrian Bunk <bunk@stusta.de> | 2007-02-28 20:12:23 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-03-01 14:53:37 -0800 |
| commit | 93a6fefe2f6fc380870c0985b246bec7f37a06f7 (patch) | |
| tree | ae724a563ba10bf27a783c720afcc1298931a454 | |
| parent | c1e16aa2792a129d8920e22210ef21eb62a0f80a (diff) | |
[PATCH] fix the SYSCTL=n compilation
/home/bunk/linux/kernel-2.6/linux-2.6.20-mm2/kernel/sysctl.c:1411: error: conflicting types for 'register_sysctl_table'
/home/bunk/linux/kernel-2.6/linux-2.6.20-mm2/include/linux/sysctl.h:1042: error: previous declaration of 'register_sysctl_table' was here
make[2]: *** [kernel/sysctl.o] Error 1
Caused by commit 0b4d414714f0d2f922d39424b0c5c82ad900a381.
Signed-off-by: Adrian Bunk <bunk@stusta.de>
Cc: "Eric W. Biederman" <ebiederm@xmission.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
| -rw-r--r-- | kernel/sysctl.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/kernel/sysctl.c b/kernel/sysctl.c index 3ca1d5ff0319..34b2301276ce 100644 --- a/kernel/sysctl.c +++ b/kernel/sysctl.c @@ -1359,8 +1359,7 @@ void unregister_sysctl_table(struct ctl_table_header * header) } #else /* !CONFIG_SYSCTL */ -struct ctl_table_header * register_sysctl_table(ctl_table * table, - int insert_at_head) +struct ctl_table_header *register_sysctl_table(ctl_table * table) { return NULL; } |