Skip to content

Commit 93a6fef

Browse files
AdrianBunkLinus Torvalds
authored and
Linus Torvalds
committed
[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 0b4d414. Signed-off-by: Adrian Bunk <[email protected]> Cc: "Eric W. Biederman" <[email protected]> Signed-off-by: Andrew Morton <[email protected]> Signed-off-by: Linus Torvalds <[email protected]>
1 parent c1e16aa commit 93a6fef

File tree

1 file changed

+1
-2
lines changed

1 file changed

+1
-2
lines changed

kernel/sysctl.c

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1359,8 +1359,7 @@ void unregister_sysctl_table(struct ctl_table_header * header)
13591359
}
13601360

13611361
#else /* !CONFIG_SYSCTL */
1362-
struct ctl_table_header * register_sysctl_table(ctl_table * table,
1363-
int insert_at_head)
1362+
struct ctl_table_header *register_sysctl_table(ctl_table * table)
13641363
{
13651364
return NULL;
13661365
}

0 commit comments

Comments
 (0)