Merge master.kernel.org:/pub/scm/linux/kernel/git/sfrench/cifs-2.6

[linux.git] / include / net / raw.h

diff --git a/include/net/raw.h b/include/net/raw.h
index f47917469b12121c9b3d770514f474ae5bf7a9d7..e4af59781949f12b0a097fafd06abea7ee841fde 100644 (file)
--- a/include/net/raw.h
+++ b/include/net/raw.h
@@ -17,7 +17,8 @@
 #ifndef _RAW_H
 #define _RAW_H
 
-#include <linux/config.h>
+
+#include <net/protocol.h>
 
 extern struct proto raw_prot;
 
@@ -34,7 +35,7 @@ extern rwlock_t raw_v4_lock;
 
 
 extern struct sock *__raw_v4_lookup(struct sock *sk, unsigned short num,
-                                   unsigned long raddr, unsigned long laddr,
+                                   __be32 raddr, __be32 laddr,
                                    int dif);
 
 extern int raw_v4_input(struct sk_buff *skb, struct iphdr *iph, int hash);