From 54345dd68139d3338fd3369684987fa2f0842cca Mon Sep 17 00:00:00 2001
From: Paul Gortmaker <paul.gortmaker@windriver.com>
Date: Fri, 27 May 2011 16:14:23 -0400
Subject: [PATCH] --- yaml --- r: 274483 b: refs/heads/master c:
 578b9ce0095ff3dd2c3b94508407c3be8fcce68d h: refs/heads/master i:   274481:
 6a786e2d7b2c079f66301eeb65351e302eb428f9   274479:
 60fce9479897fe084e0d596a0f4d95dd8f767927 v: v3

---
 [refs]                                    | 2 +-
 trunk/drivers/tty/hvc/hvc_iseries.c       | 1 +
 trunk/drivers/tty/hvc/hvc_vio.c           | 1 +
 trunk/drivers/tty/serial/jsm/jsm_driver.c | 2 +-
 trunk/drivers/tty/serial/kgdboc.c         | 1 +
 trunk/drivers/tty/serial/max3100.c        | 1 +
 trunk/drivers/tty/serial/max3107-aava.c   | 1 +
 trunk/drivers/tty/serial/max3107.c        | 1 +
 trunk/drivers/tty/serial/timbuart.c       | 1 +
 trunk/drivers/tty/serial/xilinx_uartps.c  | 1 +
 10 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 6538f18517c3..9ea5d6d48f6d 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: a59b968ee0ff6e68443d5790fda2a117b36c1f9b
+refs/heads/master: 578b9ce0095ff3dd2c3b94508407c3be8fcce68d
diff --git a/trunk/drivers/tty/hvc/hvc_iseries.c b/trunk/drivers/tty/hvc/hvc_iseries.c
index 21c54955084e..3f4a897bf4d7 100644
--- a/trunk/drivers/tty/hvc/hvc_iseries.c
+++ b/trunk/drivers/tty/hvc/hvc_iseries.c
@@ -23,6 +23,7 @@
 #include <linux/types.h>
 #include <linux/init.h>
 #include <linux/kernel.h>
+#include <linux/module.h>
 #include <linux/spinlock.h>
 #include <linux/console.h>
 
diff --git a/trunk/drivers/tty/hvc/hvc_vio.c b/trunk/drivers/tty/hvc/hvc_vio.c
index 130aace67f31..fc3c3ad6c072 100644
--- a/trunk/drivers/tty/hvc/hvc_vio.c
+++ b/trunk/drivers/tty/hvc/hvc_vio.c
@@ -41,6 +41,7 @@
 #include <linux/delay.h>
 #include <linux/slab.h>
 #include <linux/console.h>
+#include <linux/module.h>
 
 #include <asm/hvconsole.h>
 #include <asm/vio.h>
diff --git a/trunk/drivers/tty/serial/jsm/jsm_driver.c b/trunk/drivers/tty/serial/jsm/jsm_driver.c
index 648b6a3efa32..7c867a046c97 100644
--- a/trunk/drivers/tty/serial/jsm/jsm_driver.c
+++ b/trunk/drivers/tty/serial/jsm/jsm_driver.c
@@ -24,7 +24,7 @@
  *
  *
  ***********************************************************************/
-#include <linux/moduleparam.h>
+#include <linux/module.h>
 #include <linux/pci.h>
 #include <linux/slab.h>
 
diff --git a/trunk/drivers/tty/serial/kgdboc.c b/trunk/drivers/tty/serial/kgdboc.c
index 87e7e6c876d4..2b42a01a81c6 100644
--- a/trunk/drivers/tty/serial/kgdboc.c
+++ b/trunk/drivers/tty/serial/kgdboc.c
@@ -19,6 +19,7 @@
 #include <linux/console.h>
 #include <linux/vt_kern.h>
 #include <linux/input.h>
+#include <linux/module.h>
 
 #define MAX_CONFIG_LEN		40
 
diff --git a/trunk/drivers/tty/serial/max3100.c b/trunk/drivers/tty/serial/max3100.c
index 2af5aa5f3a80..8a6cc8c30b5a 100644
--- a/trunk/drivers/tty/serial/max3100.c
+++ b/trunk/drivers/tty/serial/max3100.c
@@ -43,6 +43,7 @@
 #include <linux/delay.h>
 #include <linux/slab.h>
 #include <linux/device.h>
+#include <linux/module.h>
 #include <linux/serial_core.h>
 #include <linux/serial.h>
 #include <linux/spi/spi.h>
diff --git a/trunk/drivers/tty/serial/max3107-aava.c b/trunk/drivers/tty/serial/max3107-aava.c
index d73aadd7a9ad..90c40f22ec70 100644
--- a/trunk/drivers/tty/serial/max3107-aava.c
+++ b/trunk/drivers/tty/serial/max3107-aava.c
@@ -36,6 +36,7 @@
 #include <linux/platform_device.h>
 #include <linux/gpio.h>
 #include <linux/sfi.h>
+#include <linux/module.h>
 #include <asm/mrst.h>
 #include "max3107.h"
 
diff --git a/trunk/drivers/tty/serial/max3107.c b/trunk/drivers/tty/serial/max3107.c
index db00b595cab0..7827000db4f5 100644
--- a/trunk/drivers/tty/serial/max3107.c
+++ b/trunk/drivers/tty/serial/max3107.c
@@ -36,6 +36,7 @@
 #include <linux/gpio.h>
 #include <linux/spi/spi.h>
 #include <linux/freezer.h>
+#include <linux/module.h>
 #include "max3107.h"
 
 static const struct baud_table brg26_ext[] = {
diff --git a/trunk/drivers/tty/serial/timbuart.c b/trunk/drivers/tty/serial/timbuart.c
index a4b63bfeaa2f..e76c8b747fb8 100644
--- a/trunk/drivers/tty/serial/timbuart.c
+++ b/trunk/drivers/tty/serial/timbuart.c
@@ -29,6 +29,7 @@
 #include <linux/platform_device.h>
 #include <linux/ioport.h>
 #include <linux/slab.h>
+#include <linux/module.h>
 
 #include "timbuart.h"
 
diff --git a/trunk/drivers/tty/serial/xilinx_uartps.c b/trunk/drivers/tty/serial/xilinx_uartps.c
index 8c03b127fd03..b627363352e5 100644
--- a/trunk/drivers/tty/serial/xilinx_uartps.c
+++ b/trunk/drivers/tty/serial/xilinx_uartps.c
@@ -20,6 +20,7 @@
 #include <linux/irq.h>
 #include <linux/io.h>
 #include <linux/of.h>
+#include <linux/module.h>
 
 #define XUARTPS_TTY_NAME	"ttyPS"
 #define XUARTPS_NAME		"xuartps"