Fix compile errors in SGI console drivers (linux-next tree)

The below is the patch to replace blindly all possible places,
including Jack's fixes.

Signed-off-by: Takashi Iwai <tiwai@suse.de>
(Reviewed and checked rather than blindly added)
Signed-off-by: Alan Cox <alan@redhat.com>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

diff --cc drivers/serial/21285.c
Simple merge

diff --cc drivers/serial/68328serial.c
Simple merge

diff --cc drivers/serial/68360serial.c
Simple merge

diff --cc drivers/serial/amba-pl010.c
Simple merge

diff --cc drivers/serial/amba-pl011.c
Simple merge

diff --cc drivers/serial/bfin_5xx.c
Simple merge

diff --cc drivers/serial/bfin_sport_uart.c
Simple merge

diff --cc drivers/serial/clps711x.c
Simple merge

diff --cc drivers/serial/crisv10.c
Simple merge

diff --cc drivers/serial/dz.c
Simple merge

diff --cc drivers/serial/imx.c
Simple merge

diff --cc drivers/serial/ioc4_serial.c
Simple merge

diff --cc drivers/serial/ip22zilog.c
Simple merge

diff --cc drivers/serial/m32r_sio.c
Simple merge

diff --cc drivers/serial/mcf.c
Simple merge

diff --cc drivers/serial/mcfserial.c
Simple merge

diff --cc drivers/serial/mpc52xx_uart.c
Simple merge

diff --cc drivers/serial/mpsc.c
Simple merge

diff --cc drivers/serial/mux.c
Simple merge

diff --cc drivers/serial/netx-serial.c
Simple merge

diff --cc drivers/serial/pnx8xxx_uart.c
Simple merge

diff --cc drivers/serial/pxa.c
Simple merge

diff --cc drivers/serial/sa1100.c
Simple merge

diff --cc drivers/serial/sb1250-duart.c
Simple merge

diff --cc drivers/serial/sc26xx.c
Simple merge

diff --cc drivers/serial/serial_ks8695.c
Simple merge

diff --cc drivers/serial/serial_lh7a40x.c
Simple merge

diff --cc drivers/serial/sh-sci.c
Simple merge

diff --cc drivers/serial/uartlite.c
Simple merge

diff --cc drivers/serial/ucc_uart.c
Simple merge

diff --cc drivers/serial/v850e_uart.c
Simple merge

diff --cc drivers/serial/vr41xx_siu.c
Simple merge

diff --cc drivers/serial/zs.c
Simple merge