Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 6f3a28f7 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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
  ...
parents 6ebfc0e2 75fde2ed

arch/frv/kernel/setup.c

+0 −1
Original line number Diff line number Diff line
@@ -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>

arch/ia64/kernel/setup.c

+0 −1
Original line number Diff line number Diff line
@@ -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>

arch/mips/cobalt/setup.c

+0 −1
Original line number Diff line number Diff line
@@ -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>

arch/mips/lasat/setup.c

+0 −1
Original line number Diff line number Diff line
@@ -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>

drivers/char/pcmcia/synclink_cs.c

+0 −1
Original line number Diff line number Diff line
@@ -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>