Merge branch 'master' into upstream

Conflicts:

	drivers/scsi/libata-core.c
	drivers/scsi/libata-scsi.c
	include/linux/pci_ids.h

1 files changed, 1 insertions, 2 deletions

diff --git a/include/net/raw.h b/include/net/raw.h
index e67b28a0248c..e4af59781949 100644
--- a/include/net/raw.h
+++ b/include/net/raw.h
@@ -17,7 +17,6 @@
 #ifndef _RAW_H
 #define _RAW_H
 
-#include <linux/config.h>
 
 #include <net/protocol.h>
 
@@ -36,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);