Merge branch 'features' of git://farnsworth.org/dale/linux-2.6-mv643xx_eth into upstream

[linux-2.6-omap-h63xx.git] / fs / proc / internal.h

diff --git a/fs/proc/internal.h b/fs/proc/internal.h
index b215c3524fa685c572c874966128241d6747e9dd..1820eb2ef7623a2c222e9be9b61d0e749f259187 100644 (file)
--- a/fs/proc/internal.h
+++ b/fs/proc/internal.h
@@ -16,6 +16,11 @@ extern int proc_sys_init(void);
 #else
 static inline void proc_sys_init(void) { }
 #endif
+#ifdef CONFIG_NET
+extern int proc_net_init(void);
+#else
+static inline int proc_net_init(void) { return 0; }
+#endif
 
 struct vmalloc_info {
        unsigned long   used;