diff options
| author | Linus Torvalds <torvalds@g5.osdl.org> | 2006-10-03 12:13:29 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-10-03 12:13:29 -0400 |
| commit | 6f3a28f7d1f0a65a78443c273b6e8ec01becf301 (patch) | |
| tree | ea57276725b31ba115f44cb5267a7d85b133e6fb /arch/ia64 | |
| parent | 6ebfc0e20b409f13e62bbb84ce70102b49945cfd (diff) | |
| parent | 75fde2eddcfcd1dcc87a72dc6cd3c859420b6148 (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/ia64')
| -rw-r--r-- | arch/ia64/kernel/setup.c | 1 |
1 files changed, 0 insertions, 1 deletions
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> |