Skip to content

Commit

Permalink
[PATCH] fix the SYSCTL=n compilation
Browse files Browse the repository at this point in the history
/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 0b4d414.

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>
  • Loading branch information
AdrianBunk authored and Linus Torvalds committed Mar 1, 2007
1 parent c1e16aa commit 93a6fef
Showing 1 changed file with 1 addition and 2 deletions.
3 changes: 1 addition & 2 deletions kernel/sysctl.c
Original file line number Diff line number Diff line change
Expand Up @@ -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;
}
Expand Down

0 comments on commit 93a6fef

Please sign in to comment.