Merge master.kernel.org:/home/rmk/linux-2.6-mmc

[linux-2.6] / include / net / raw.h

diff --git a/include/net/raw.h b/include/net/raw.h
index 1c4bc3e6809fab2cb5f745207fca722ca90d863e..e67b28a0248c3ce5c8c831634a475ae9017eeafc 100644 (file)
--- a/include/net/raw.h
+++ b/include/net/raw.h
@@ -17,9 +17,11 @@
 #ifndef _RAW_H
 #define _RAW_H
 
+#include <linux/config.h>
 
-extern struct proto raw_prot;
+#include <net/protocol.h>
 
+extern struct proto raw_prot;
 
 extern void    raw_err(struct sock *, struct sk_buff *, u32 info);
 extern int     raw_rcv(struct sock *, struct sk_buff *);
@@ -39,4 +41,9 @@ extern struct sock *__raw_v4_lookup(struct sock *sk, unsigned short num,
 
 extern int raw_v4_input(struct sk_buff *skb, struct iphdr *iph, int hash);
 
+#ifdef CONFIG_PROC_FS
+extern int  raw_proc_init(void);
+extern void raw_proc_exit(void);
+#endif
+
 #endif /* _RAW_H */