Commit 93a6fefe authored Feb 28, 2007 by Adrian Bunk Committed by Linus Torvalds Mar 01, 2007

[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 0b4d4147.

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>

parent c1e16aa2

kernel/sysctl.c

+1 −2

Original line number	Diff line number	Diff line
		@@ -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;
		}