[2.6.21 patch] fix the SYSCTL=n compilation

[Adrian Bunk]

This patch fixes the following compile error with CONFIG_SYSCTL=n:

<--  snip  -->

...
  CC      kernel/sysctl.o
/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

<--  snip  -->


Caused by commit 0b4d414714f0d2f922d39424b0c5c82ad900a381.

Signed-off-by: Adrian Bunk <bunk@xxxxxxxxx>

---
--- linux-2.6.20-mm2/kernel/sysctl.c.old	2007-02-19 17:52:28.000000000 +0100
+++ linux-2.6.20-mm2/kernel/sysctl.c	2007-02-19 17:53:22.000000000 +0100
@@ -1406,8 +1406,7 @@
 }
 
 #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;
 }

-
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/