Merge remote-tracking branch 'tty/tty-next'

Conflicts:
	drivers/tty/serial/Kconfig
	drivers/tty/serial/Makefile

diff --cc arch/x86/include/asm/mrst.h
Simple merge

diff --cc arch/x86/kernel/early_printk.c
Simple merge

diff --cc drivers/tty/serial/Kconfig
index 127854226f32dda5c241b390f7fb9b4d170d62a8,d1e4f203ae619ff63b1b327ed36da34f1ef422cf..aca2386c5ef10261e74bfb66b2461546c8206150
--- 1/drivers/tty/serial/Kconfig
--- 2/drivers/tty/serial/Kconfig
+++ b/drivers/tty/serial/Kconfig
@@@ -495,6 -500,68 +500,28 @@@ config SERIAL_SAMSUNG_CONSOL
          your boot loader about how to pass options to the kernel at
          boot time.)
  
 -config SERIAL_S3C2410
 -      tristate "Samsung S3C2410 Serial port support"
 -      depends on SERIAL_SAMSUNG && CPU_S3C2410
 -      default y if CPU_S3C2410
 -      help
 -        Serial port support for the Samsung S3C2410 SoC
 -
 -config SERIAL_S3C2412
 -      tristate "Samsung S3C2412/S3C2413 Serial port support"
 -      depends on SERIAL_SAMSUNG && CPU_S3C2412
 -      default y if CPU_S3C2412
 -      help
 -        Serial port support for the Samsung S3C2412 and S3C2413 SoC
 -
 -config SERIAL_S3C2440
 -      tristate "Samsung S3C2440/S3C2442/S3C2416 Serial port support"
 -      depends on SERIAL_SAMSUNG && (CPU_S3C2440 || CPU_S3C2442 || CPU_S3C2416)
 -      default y if CPU_S3C2440
 -      default y if CPU_S3C2442
 -      select SERIAL_SAMSUNG_UARTS_4 if CPU_S3C2416
 -      help
 -        Serial port support for the Samsung S3C2440, S3C2416 and S3C2442 SoC
 -
 -config SERIAL_S3C6400
 -      tristate "Samsung S3C6400/S3C6410/S5P6440/S5P6450/S5PC100 Serial port support"
 -      depends on SERIAL_SAMSUNG && (CPU_S3C6400 || CPU_S3C6410 || CPU_S5P6440 || CPU_S5P6450 || CPU_S5PC100)
 -      select SERIAL_SAMSUNG_UARTS_4
 -      default y
 -      help
 -        Serial port support for the Samsung S3C6400, S3C6410, S5P6440, S5P6450
 -        and S5PC100 SoCs
 -
 -config SERIAL_S5PV210
 -      tristate "Samsung S5PV210 Serial port support"
 -      depends on SERIAL_SAMSUNG && (CPU_S5PV210 || CPU_EXYNOS4210 || SOC_EXYNOS4212)
 -      select SERIAL_SAMSUNG_UARTS_4 if (CPU_S5PV210 || CPU_EXYNOS4210 || SOC_EXYNOS4212)
 -      default y
 -      help
 -        Serial port support for Samsung's S5P Family of SoC's
 -
+ config SERIAL_SIRFSOC
+         tristate "SiRF SoC Platform Serial port support"
+         depends on ARM && ARCH_PRIMA2
+         select SERIAL_CORE
+         help
+           Support for the on-chip UART on the CSR SiRFprimaII series,
+           providing /dev/ttySiRF0, 1 and 2 (note, some machines may not
+           provide all of these ports, depending on how the serial port
+           pins are configured).
+ 
+ config SERIAL_SIRFSOC_CONSOLE
+         bool "Support for console on SiRF SoC serial port"
+         depends on SERIAL_SIRFSOC=y
+         select SERIAL_CORE_CONSOLE
+         help
+           Even if you say Y here, the currently visible virtual console
+           (/dev/tty0) will still be used as the system console by default, but
+           you can alter that using a kernel command line option such as
+           "console=ttySiRFx". (Try "man bootparam" or see the documentation of
+           your boot loader about how to pass options to the kernel at
+           boot time.)
+ 
  config SERIAL_MAX3100
        tristate "MAX3100 support"
        depends on SPI

diff --cc drivers/tty/serial/Makefile
index 62f7d285db55d1f5fcfd84d07f02c7c531413e10,75eadb8d717822de777c8292f22b89be10216f96..4eebe46e97e8691cecbfc69bc06a03f3b204b7d2
--- 1/drivers/tty/serial/Makefile
--- 2/drivers/tty/serial/Makefile
+++ b/drivers/tty/serial/Makefile
@@@ -89,4 -95,4 +90,5 @@@ obj-$(CONFIG_SERIAL_MSM_SMD)  += msm_smd
  obj-$(CONFIG_SERIAL_MXS_AUART) += mxs-auart.o
  obj-$(CONFIG_SERIAL_LANTIQ)   += lantiq.o
  obj-$(CONFIG_SERIAL_XILINX_PS_UART) += xilinx_uartps.o
 +obj-$(CONFIG_SERIAL_AR933X)   += ar933x_uart.o
+ obj-$(CONFIG_SERIAL_SIRFSOC) += sirfsoc_uart.o

diff --cc drivers/tty/serial/omap-serial.c
index ca24ab37d11c96cfa9618b52a9260296806bfea1,f2a1380ed678b007f4690ac1d6f7d10e202aca37..d192dcbb82f5e464f9ab6beb8805a2dcd1c6733b
--- 1/drivers/tty/serial/omap-serial.c
--- 2/drivers/tty/serial/omap-serial.c
+++ b/drivers/tty/serial/omap-serial.c
@@@ -433,14 -399,11 +433,14 @@@ static unsigned int serial_omap_tx_empt
  static unsigned int serial_omap_get_mctrl(struct uart_port *port)
  {
        struct uart_omap_port *up = (struct uart_omap_port *)port;
-       unsigned char status;
+       unsigned int status;
        unsigned int ret = 0;
  
 +      pm_runtime_get_sync(&up->pdev->dev);
        status = check_modem_status(up);
 -      dev_dbg(up->port.dev, "serial_omap_get_mctrl+%d\n", up->pdev->id);
 +      pm_runtime_put(&up->pdev->dev);
 +
 +      dev_dbg(up->port.dev, "serial_omap_get_mctrl+%d\n", up->port.line);
  
        if (status & UART_MSR_DCD)
                ret |= TIOCM_CAR;

diff --cc drivers/tty/serial/pch_uart.c
Simple merge

diff --cc include/linux/serial_core.h
Simple merge