summaryrefslogtreecommitdiff
path: root/kernel/sysctl.c
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@ppc970.osdl.org>2004-07-02 00:07:38 -0700
committerLinus Torvalds <torvalds@ppc970.osdl.org>2004-07-02 00:07:38 -0700
commit9ce0eacbda1933de8c47b297550af20dfb7ff468 (patch)
treeae2e4580c6a13985b84b6947e9f9dd259e50ab51 /kernel/sysctl.c
parent15b273f1b4f4fc018a8c699d4e3c90cdc829d924 (diff)
parenta0c7a5f9edef1d081f02452bb5d4ce3a1fb00de6 (diff)
Merge bk://gkernel.bkbits.net/net-drivers-2.6
into ppc970.osdl.org:/home/torvalds/v2.6/linux
Diffstat (limited to 'kernel/sysctl.c')
-rw-r--r--kernel/sysctl.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/kernel/sysctl.c b/kernel/sysctl.c
index 641727bab22f..0df0748d56bd 100644
--- a/kernel/sysctl.c
+++ b/kernel/sysctl.c
@@ -2162,7 +2162,7 @@ int proc_doulongvec_ms_jiffies_minmax(ctl_table *table, int write,
struct ctl_table_header * register_sysctl_table(ctl_table * table,
int insert_at_head)
{
- return 0;
+ return NULL;
}
void unregister_sysctl_table(struct ctl_table_header * table)