5 files changed, 4 insertions, 8 deletions

diff --git a/include/linux/bcma/bcma.h b/include/linux/bcma/bcma.h
index f4b8346b1a33..83c209f39493 100644
--- a/include/linux/bcma/bcma.h
+++ b/include/linux/bcma/bcma.h
@@ -162,7 +162,7 @@ struct bcma_driver {
 
         int (*probe)(struct bcma_device *dev);
         void (*remove)(struct bcma_device *dev);
-        int (*suspend)(struct bcma_device *dev, pm_message_t state);
+        int (*suspend)(struct bcma_device *dev);
         int (*resume)(struct bcma_device *dev);
         void (*shutdown)(struct bcma_device *dev);
 
diff --git a/include/linux/miscdevice.h b/include/linux/miscdevice.h
index 32085249e9cb..0549d2115507 100644
--- a/include/linux/miscdevice.h
+++ b/include/linux/miscdevice.h
@@ -42,6 +42,7 @@
 #define AUTOFS_MINOR            235
 #define MAPPER_CTRL_MINOR       236
 #define LOOP_CTRL_MINOR         237
+#define VHOST_NET_MINOR         238
 #define MISC_DYNAMIC_MINOR      255
 
 struct device;
diff --git a/include/linux/netfilter/nf_conntrack_common.h b/include/linux/netfilter/nf_conntrack_common.h
index 9e3a2838291b..0d3dd66322ec 100644
--- a/include/linux/netfilter/nf_conntrack_common.h
+++ b/include/linux/netfilter/nf_conntrack_common.h
@@ -83,10 +83,6 @@ enum ip_conntrack_status {
         /* Conntrack is a fake untracked entry */
         IPS_UNTRACKED_BIT = 12,
         IPS_UNTRACKED = (1 << IPS_UNTRACKED_BIT),
-
-        /* Conntrack has a userspace helper. */
-        IPS_USERSPACE_HELPER_BIT = 13,
-        IPS_USERSPACE_HELPER = (1 << IPS_USERSPACE_HELPER_BIT),
 };
 
 /* Connection tracking event types */
diff --git a/include/linux/netfilter/xt_CT.h b/include/linux/netfilter/xt_CT.h
index 6390f0992f36..b56e76811c04 100644
--- a/include/linux/netfilter/xt_CT.h
+++ b/include/linux/netfilter/xt_CT.h
@@ -3,8 +3,7 @@
 
 #include <linux/types.h>
 
-#define XT_CT_NOTRACK           0x1
-#define XT_CT_USERSPACE_HELPER  0x2
+#define XT_CT_NOTRACK   0x1
 
 struct xt_ct_target_info {
         __u16 flags;
diff --git a/include/net/flow.h b/include/net/flow.h
index da1f064a81b3..9b582437fbea 100644
--- a/include/net/flow.h
+++ b/include/net/flow.h
@@ -78,7 +78,7 @@ static inline void flowi4_init_output(struct flowi4 *fl4, int oif,
                                       __u32 mark, __u8 tos, __u8 scope,
                                       __u8 proto, __u8 flags,
                                       __be32 daddr, __be32 saddr,
-                                      __be16 dport, __be32 sport)
+                                      __be16 dport, __be16 sport)
 {
         fl4->flowi4_oif = oif;
         fl4->flowi4_iif = 0;