summaryrefslogtreecommitdiff
path: root/kernel/sysctl.c
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@ppc970.osdl.org>2004-07-02 06:34:04 -0700
committerLinus Torvalds <torvalds@ppc970.osdl.org>2004-07-02 06:34:04 -0700
commitfaa7a4c05ace72d85bbfb8d2a458a80491f8045b (patch)
tree360c5cb33ba4e4c762d0052af0c0e856d592328a /kernel/sysctl.c
parent62054d49783cfe93c9cee9d90a0779f1f9054968 (diff)
parent9da9210dbc752cf35fa2fe866614a1d5b1266066 (diff)
Merge bk://linux-ntfs.bkbits.net/ntfs-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)