aboutsummaryrefslogtreecommitdiffstats
path: root/arch
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@g5.osdl.org>2006-10-03 12:13:29 -0400
committerLinus Torvalds <torvalds@g5.osdl.org>2006-10-03 12:13:29 -0400
commit6f3a28f7d1f0a65a78443c273b6e8ec01becf301 (patch)
treeea57276725b31ba115f44cb5267a7d85b133e6fb /arch
parent6ebfc0e20b409f13e62bbb84ce70102b49945cfd (diff)
parent75fde2eddcfcd1dcc87a72dc6cd3c859420b6148 (diff)
Merge branch 'devel' of master.kernel.org:/home/rmk/linux-2.6-serial
* 'devel' of master.kernel.org:/home/rmk/linux-2.6-serial: (21 commits) [SERIAL] add PNP IDs for FPI based touchscreens [SERIAL] Magic SysRq SAK does nothing on serial consoles [SERIAL] tickle NMI watchdog on serial output. [SERIAL] Fix oops when removing suspended serial port [SERIAL] Fix resume handling bug [SERIAL] Remove wrong asm/serial.h inclusions [SERIAL] CONFIG_PM=n slim: drivers/serial/8250_pci.c [SERIAL] OMAP1510 serial fix for 115200 baud [SERIAL] returning proper error from serial core driver [SERIAL] Make uart_line_info() correctly tell MMIO from I/O port [SERIAL] suspend/resume handlers don't have level arg anymore [SERIAL] 8250 resourse management fixes [SERIAL] serial_cs: Add quirk for brainboxes 2-port RS232 card [SERIAL] serial_cs: handle Nokia multi->single port bodge via config quirk [SERIAL] serial_cs: add configuration quirk [SERIAL] serial_cs: Convert Oxford 950 / Possio GCC wakeup quirk [SERIAL] serial_cs: convert IBM post-init handling to a quirk [SERIAL] serial_cs: allow wildcarded quirks [SERIAL] serial_cs: convert multi-port table to quirk table [SERIAL] serial_cs: Use clean up multiport card detection ...
Diffstat (limited to 'arch')
-rw-r--r--arch/frv/kernel/setup.c1
-rw-r--r--arch/ia64/kernel/setup.c1
-rw-r--r--arch/mips/cobalt/setup.c1
-rw-r--r--arch/mips/lasat/setup.c1
4 files changed, 0 insertions, 4 deletions
diff --git a/arch/frv/kernel/setup.c b/arch/frv/kernel/setup.c
index d96a57e5f030..a8c61dac1cee 100644
--- a/arch/frv/kernel/setup.c
+++ b/arch/frv/kernel/setup.c
@@ -31,7 +31,6 @@
31#include <linux/serial_reg.h> 31#include <linux/serial_reg.h>
32 32
33#include <asm/setup.h> 33#include <asm/setup.h>
34#include <asm/serial.h>
35#include <asm/irq.h> 34#include <asm/irq.h>
36#include <asm/sections.h> 35#include <asm/sections.h>
37#include <asm/pgalloc.h> 36#include <asm/pgalloc.h>
diff --git a/arch/ia64/kernel/setup.c b/arch/ia64/kernel/setup.c
index 84f93c0f2c66..c4caa8003492 100644
--- a/arch/ia64/kernel/setup.c
+++ b/arch/ia64/kernel/setup.c
@@ -54,7 +54,6 @@
54#include <asm/processor.h> 54#include <asm/processor.h>
55#include <asm/sal.h> 55#include <asm/sal.h>
56#include <asm/sections.h> 56#include <asm/sections.h>
57#include <asm/serial.h>
58#include <asm/setup.h> 57#include <asm/setup.h>
59#include <asm/smp.h> 58#include <asm/smp.h>
60#include <asm/system.h> 59#include <asm/system.h>
diff --git a/arch/mips/cobalt/setup.c b/arch/mips/cobalt/setup.c
index c01a0170e590..0b347cffc768 100644
--- a/arch/mips/cobalt/setup.c
+++ b/arch/mips/cobalt/setup.c
@@ -23,7 +23,6 @@
23#include <asm/processor.h> 23#include <asm/processor.h>
24#include <asm/reboot.h> 24#include <asm/reboot.h>
25#include <asm/gt64120.h> 25#include <asm/gt64120.h>
26#include <asm/serial.h>
27 26
28#include <asm/mach-cobalt/cobalt.h> 27#include <asm/mach-cobalt/cobalt.h>
29 28
diff --git a/arch/mips/lasat/setup.c b/arch/mips/lasat/setup.c
index 0ffc43c600d9..14c55168f1ff 100644
--- a/arch/mips/lasat/setup.c
+++ b/arch/mips/lasat/setup.c
@@ -34,7 +34,6 @@
34#include <asm/cpu.h> 34#include <asm/cpu.h>
35#include <asm/bootinfo.h> 35#include <asm/bootinfo.h>
36#include <asm/irq.h> 36#include <asm/irq.h>
37#include <asm/serial.h>
38#include <asm/lasat/lasat.h> 37#include <asm/lasat/lasat.h>
39#include <asm/lasat/serial.h> 38#include <asm/lasat/serial.h>
40 39