From 45e5628c6a0d94d3bcf6d6e4e1e7cb2901eb57f5 Mon Sep 17 00:00:00 2001
From: Paul Gortmaker <paul.gortmaker@windriver.com>
Date: Sun, 18 Sep 2011 13:21:27 -0400
Subject: [PATCH] --- yaml --- r: 274386 b: refs/heads/master c:
 d9b9384215e17c68d7b6bd05d6fa409e5d4140d7 h: refs/heads/master v: v3

---
 [refs]                                    | 2 +-
 trunk/net/dccp/ccids/lib/tfrc.c           | 1 +
 trunk/net/mac80211/mlme.c                 | 1 +
 trunk/net/netfilter/nf_conntrack_expect.c | 1 +
 trunk/net/rds/send.c                      | 1 +
 trunk/net/rfkill/input.c                  | 1 +
 trunk/net/wireless/reg.c                  | 1 +
 7 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index 8abbd336156b..e96cecc7f20b 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 3a9a231d977222eea36eae091df2c358e03ac839
+refs/heads/master: d9b9384215e17c68d7b6bd05d6fa409e5d4140d7
diff --git a/trunk/net/dccp/ccids/lib/tfrc.c b/trunk/net/dccp/ccids/lib/tfrc.c
index 4902029854d8..1f94b7e01d39 100644
--- a/trunk/net/dccp/ccids/lib/tfrc.c
+++ b/trunk/net/dccp/ccids/lib/tfrc.c
@@ -4,6 +4,7 @@
  * Copyright (c) 2007 The University of Aberdeen, Scotland, UK
  * Copyright (c) 2007 Arnaldo Carvalho de Melo <acme@redhat.com>
  */
+#include <linux/moduleparam.h>
 #include "tfrc.h"
 
 #ifdef CONFIG_IP_DCCP_TFRC_DEBUG
diff --git a/trunk/net/mac80211/mlme.c b/trunk/net/mac80211/mlme.c
index ba2da11a997b..72f1e806a8ca 100644
--- a/trunk/net/mac80211/mlme.c
+++ b/trunk/net/mac80211/mlme.c
@@ -16,6 +16,7 @@
 #include <linux/skbuff.h>
 #include <linux/if_arp.h>
 #include <linux/etherdevice.h>
+#include <linux/moduleparam.h>
 #include <linux/rtnetlink.h>
 #include <linux/pm_qos.h>
 #include <linux/crc32.h>
diff --git a/trunk/net/netfilter/nf_conntrack_expect.c b/trunk/net/netfilter/nf_conntrack_expect.c
index cd1e8e0970f2..aaaac4461720 100644
--- a/trunk/net/netfilter/nf_conntrack_expect.c
+++ b/trunk/net/netfilter/nf_conntrack_expect.c
@@ -20,6 +20,7 @@
 #include <linux/percpu.h>
 #include <linux/kernel.h>
 #include <linux/jhash.h>
+#include <linux/moduleparam.h>
 #include <net/net_namespace.h>
 
 #include <net/netfilter/nf_conntrack.h>
diff --git a/trunk/net/rds/send.c b/trunk/net/rds/send.c
index aa57e22539ef..30a80ea6fcab 100644
--- a/trunk/net/rds/send.c
+++ b/trunk/net/rds/send.c
@@ -31,6 +31,7 @@
  *
  */
 #include <linux/kernel.h>
+#include <linux/moduleparam.h>
 #include <linux/gfp.h>
 #include <net/sock.h>
 #include <linux/in.h>
diff --git a/trunk/net/rfkill/input.c b/trunk/net/rfkill/input.c
index 1bca6d49ec96..24c55c53e6a2 100644
--- a/trunk/net/rfkill/input.c
+++ b/trunk/net/rfkill/input.c
@@ -15,6 +15,7 @@
 
 #include <linux/input.h>
 #include <linux/slab.h>
+#include <linux/moduleparam.h>
 #include <linux/workqueue.h>
 #include <linux/init.h>
 #include <linux/rfkill.h>
diff --git a/trunk/net/wireless/reg.c b/trunk/net/wireless/reg.c
index 2520a1b7e7db..c23052bca16b 100644
--- a/trunk/net/wireless/reg.c
+++ b/trunk/net/wireless/reg.c
@@ -42,6 +42,7 @@
 #include <linux/ctype.h>
 #include <linux/nl80211.h>
 #include <linux/platform_device.h>
+#include <linux/moduleparam.h>
 #include <net/cfg80211.h>
 #include "core.h"
 #include "reg.h"