From 3a928feca4f5f23b9337d973115760470bf24052 Mon Sep 17 00:00:00 2001
From: Adrian Bunk <bunk@stusta.de>
Date: Tue, 17 Jul 2007 04:03:45 -0700
Subject: [PATCH] --- yaml --- r: 60761 b: refs/heads/master c:
 62239ac2b301abc397e70986649666cfb7835907 h: refs/heads/master i:   60759:
 283e574386d5dbe5a8e11bf9f78a45ad51cf10de v: v3

---
 [refs]                   | 2 +-
 trunk/include/linux/fs.h | 5 +++++
 trunk/kernel/sysctl.c    | 4 +---
 3 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/[refs] b/[refs]
index 7c4b5478930a..3cc579e1c5ef 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: f284ce7269031947326bac6bb19a977705276222
+refs/heads/master: 62239ac2b301abc397e70986649666cfb7835907
diff --git a/trunk/include/linux/fs.h b/trunk/include/linux/fs.h
index e68780810279..b3a9f0db9d80 100644
--- a/trunk/include/linux/fs.h
+++ b/trunk/include/linux/fs.h
@@ -283,6 +283,7 @@ extern int dir_notify_enable;
 #include <linux/init.h>
 #include <linux/pid.h>
 #include <linux/mutex.h>
+#include <linux/sysctl.h>
 
 #include <asm/atomic.h>
 #include <asm/semaphore.h>
@@ -2050,5 +2051,9 @@ static inline void free_secdata(void *secdata)
 { }
 #endif	/* CONFIG_SECURITY */
 
+int proc_nr_files(ctl_table *table, int write, struct file *filp,
+		  void __user *buffer, size_t *lenp, loff_t *ppos);
+
+
 #endif /* __KERNEL__ */
 #endif /* _LINUX_FS_H */
diff --git a/trunk/kernel/sysctl.c b/trunk/kernel/sysctl.c
index 48dae075d5c2..7063ebc6db05 100644
--- a/trunk/kernel/sysctl.c
+++ b/trunk/kernel/sysctl.c
@@ -29,6 +29,7 @@
 #include <linux/utsname.h>
 #include <linux/capability.h>
 #include <linux/smp_lock.h>
+#include <linux/fs.h>
 #include <linux/init.h>
 #include <linux/kernel.h>
 #include <linux/kobject.h>
@@ -49,9 +50,6 @@
 #include <asm/uaccess.h>
 #include <asm/processor.h>
 
-extern int proc_nr_files(ctl_table *table, int write, struct file *filp,
-                     void __user *buffer, size_t *lenp, loff_t *ppos);
-
 #ifdef CONFIG_X86
 #include <asm/nmi.h>
 #include <asm/stacktrace.h>