From 2805ffa30fddb77fcf24005e0198181f570b5604 Mon Sep 17 00:00:00 2001
From: Russell King <rmk@dyn-67.arm.linux.org.uk>
Date: Wed, 30 Aug 2006 10:27:15 +0100
Subject: [PATCH] --- yaml --- r: 38218 b: refs/heads/master c:
 bcf5111a58c7db968c3fb9cd77e340a5e076f549 h: refs/heads/master v: v3

---
 [refs]                                  | 2 +-
 trunk/arch/frv/kernel/setup.c           | 1 -
 trunk/arch/ia64/kernel/setup.c          | 1 -
 trunk/arch/mips/cobalt/setup.c          | 1 -
 trunk/arch/mips/lasat/setup.c           | 1 -
 trunk/drivers/char/pcmcia/synclink_cs.c | 1 -
 trunk/drivers/char/synclink.c           | 1 -
 7 files changed, 1 insertion(+), 7 deletions(-)

diff --git a/[refs] b/[refs]
index 3d0777712bd9..8c241c9a23be 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 1d5e799663046917a0eb085e716d818af20050b2
+refs/heads/master: bcf5111a58c7db968c3fb9cd77e340a5e076f549
diff --git a/trunk/arch/frv/kernel/setup.c b/trunk/arch/frv/kernel/setup.c
index d96a57e5f030..a8c61dac1cee 100644
--- a/trunk/arch/frv/kernel/setup.c
+++ b/trunk/arch/frv/kernel/setup.c
@@ -31,7 +31,6 @@
 #include <linux/serial_reg.h>
 
 #include <asm/setup.h>
-#include <asm/serial.h>
 #include <asm/irq.h>
 #include <asm/sections.h>
 #include <asm/pgalloc.h>
diff --git a/trunk/arch/ia64/kernel/setup.c b/trunk/arch/ia64/kernel/setup.c
index 84f93c0f2c66..c4caa8003492 100644
--- a/trunk/arch/ia64/kernel/setup.c
+++ b/trunk/arch/ia64/kernel/setup.c
@@ -54,7 +54,6 @@
 #include <asm/processor.h>
 #include <asm/sal.h>
 #include <asm/sections.h>
-#include <asm/serial.h>
 #include <asm/setup.h>
 #include <asm/smp.h>
 #include <asm/system.h>
diff --git a/trunk/arch/mips/cobalt/setup.c b/trunk/arch/mips/cobalt/setup.c
index c01a0170e590..0b347cffc768 100644
--- a/trunk/arch/mips/cobalt/setup.c
+++ b/trunk/arch/mips/cobalt/setup.c
@@ -23,7 +23,6 @@
 #include <asm/processor.h>
 #include <asm/reboot.h>
 #include <asm/gt64120.h>
-#include <asm/serial.h>
 
 #include <asm/mach-cobalt/cobalt.h>
 
diff --git a/trunk/arch/mips/lasat/setup.c b/trunk/arch/mips/lasat/setup.c
index 0ffc43c600d9..14c55168f1ff 100644
--- a/trunk/arch/mips/lasat/setup.c
+++ b/trunk/arch/mips/lasat/setup.c
@@ -34,7 +34,6 @@
 #include <asm/cpu.h>
 #include <asm/bootinfo.h>
 #include <asm/irq.h>
-#include <asm/serial.h>
 #include <asm/lasat/lasat.h>
 #include <asm/lasat/serial.h>
 
diff --git a/trunk/drivers/char/pcmcia/synclink_cs.c b/trunk/drivers/char/pcmcia/synclink_cs.c
index 00f574cbb0d4..539efe782618 100644
--- a/trunk/drivers/char/pcmcia/synclink_cs.c
+++ b/trunk/drivers/char/pcmcia/synclink_cs.c
@@ -57,7 +57,6 @@
 #include <linux/netdevice.h>
 #include <linux/vmalloc.h>
 #include <linux/init.h>
-#include <asm/serial.h>
 #include <linux/delay.h>
 #include <linux/ioctl.h>
 
diff --git a/trunk/drivers/char/synclink.c b/trunk/drivers/char/synclink.c
index 78b1b1a2732b..c53f4579a59f 100644
--- a/trunk/drivers/char/synclink.c
+++ b/trunk/drivers/char/synclink.c
@@ -87,7 +87,6 @@
 
 #include <linux/vmalloc.h>
 #include <linux/init.h>
-#include <asm/serial.h>
 
 #include <linux/delay.h>
 #include <linux/ioctl.h>