Alan Cox 1aa3692da5 ttydev: Fix up compile failures in the PPC build ...

Fix up a couple of reported merge problems

Signed-off-by: Alan Cox <alan@redhat.com>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

2008-07-22 13:03:22 -07:00

..

cpm_uart

cpm_uart: Support uart_wait_until_sent()

2008-07-14 07:55:38 -05:00

jsm

serial: use tty_port

2008-07-20 17:12:35 -07:00

8250_accent.c

…

8250_acorn.c

…

8250_boca.c

…

8250_early.c

…

8250_exar_st16c554.c

…

8250_fourport.c

…

8250_gsc.c

…

8250_hp300.c

…

8250_hub6.c

…

8250_mca.c

…

8250_pci.c

drivers/serial/: remove CVS keywords

2008-07-20 17:12:35 -07:00

8250_pnp.c

drivers/serial/: remove CVS keywords

2008-07-20 17:12:35 -07:00

8250.c

serial: use tty_port

2008-07-20 17:12:35 -07:00

8250.h

drivers/serial/: remove CVS keywords

2008-07-20 17:12:35 -07:00

21285.c

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

2008-07-20 17:12:36 -07:00

68328serial.c

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

2008-07-20 17:12:36 -07:00

68328serial.h

…

68360serial.c

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

2008-07-20 17:12:36 -07:00

amba-pl010.c

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

2008-07-20 17:12:36 -07:00

amba-pl011.c

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

2008-07-20 17:12:36 -07:00

atmel_serial.c

atmel_serial: Fix tty_port breakage

2008-07-20 17:12:37 -07:00

bfin_5xx.c

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

2008-07-20 17:12:36 -07:00

bfin_sport_uart.c

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

2008-07-20 17:12:36 -07:00

bfin_sport_uart.h

…

clps711x.c

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

2008-07-20 17:12:36 -07:00

crisv10.c

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

2008-07-20 17:12:36 -07:00

crisv10.h

…

dz.c

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

2008-07-20 17:12:36 -07:00

dz.h

…

icom.c

ttydev: Fix up compile failures in the PPC build

2008-07-22 13:03:22 -07:00

icom.h

…

imx.c

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

2008-07-20 17:12:36 -07:00

ioc3_serial.c

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

2008-07-20 17:12:36 -07:00

ioc4_serial.c

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

2008-07-20 17:12:36 -07:00

ip22zilog.c

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

2008-07-20 17:12:36 -07:00

ip22zilog.h

…

Kconfig

drivers/serial/: remove CVS keywords

2008-07-20 17:12:35 -07:00

kgdboc.c

…

m32r_sio_reg.h

…

m32r_sio.c

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

2008-07-20 17:12:36 -07:00

m32r_sio.h

…

Makefile

drivers/serial/: remove CVS keywords

2008-07-20 17:12:35 -07:00

mcf.c

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

2008-07-20 17:12:36 -07:00

mcfserial.c

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

2008-07-20 17:12:36 -07:00

mcfserial.h

…

mpc52xx_uart.c

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

2008-07-20 17:12:36 -07:00

mpsc.c

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

2008-07-20 17:12:36 -07:00

mux.c

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

2008-07-20 17:12:36 -07:00

netx-serial.c

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

2008-07-20 17:12:36 -07:00

of_serial.c

of_serial: Use linux/of_platform.h instead of asm

2008-06-09 13:46:37 +10:00

pmac_zilog.c

ttydev: fix pamc_zilog for tty pointer move

2008-07-20 17:12:36 -07:00

pmac_zilog.h

…

pnx8xxx_uart.c

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

2008-07-20 17:12:36 -07:00

pxa.c

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

2008-07-20 17:12:36 -07:00

s3c2400.c

[ARM] S3C24XX: Split serial driver into core and per-cpu drivers

2008-07-03 16:51:31 +01:00

s3c2410.c

[ARM] S3C24XX: Split serial driver into core and per-cpu drivers

2008-07-03 16:51:31 +01:00

s3c2412.c

[ARM] S3C24XX: Split serial driver into core and per-cpu drivers

2008-07-03 16:51:31 +01:00

s3c2440.c

[ARM] S3C24XX: Split serial driver into core and per-cpu drivers

2008-07-03 16:51:31 +01:00

sa1100.c

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

2008-07-20 17:12:36 -07:00

samsung.c

[ARM] S3C24XX: Split serial driver into core and per-cpu drivers

2008-07-03 16:51:31 +01:00

samsung.h

[ARM] S3C24XX: Split serial driver into core and per-cpu drivers

2008-07-03 16:51:31 +01:00

sb1250-duart.c

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

2008-07-20 17:12:36 -07:00

sc26xx.c

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

2008-07-20 17:12:36 -07:00

serial_core.c

serial: use tty_port

2008-07-20 17:12:35 -07:00

serial_cs.c

…

serial_ks8695.c

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

2008-07-20 17:12:36 -07:00

serial_lh7a40x.c

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

2008-07-20 17:12:36 -07:00

serial_txx9.c

ttydev: Fix up compile failures in the PPC build

2008-07-22 13:03:22 -07:00

sh-sci.c

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

2008-07-20 17:12:36 -07:00

sh-sci.h

…

sn_console.c

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

2008-07-20 17:12:36 -07:00

suncore.c

…

suncore.h

…

sunhv.c

ttydev: fix pamc_zilog for tty pointer move

2008-07-20 17:12:35 -07:00

sunsab.c

ttydev: fix pamc_zilog for tty pointer move

2008-07-20 17:12:35 -07:00

sunsab.h

…

sunsu.c

ttydev: fix pamc_zilog for tty pointer move

2008-07-20 17:12:35 -07:00

sunzilog.c

ttydev: fix pamc_zilog for tty pointer move

2008-07-20 17:12:35 -07:00

sunzilog.h

…

uartlite.c

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

2008-07-20 17:12:36 -07:00

ucc_uart.c

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

2008-07-20 17:12:36 -07:00

v850e_uart.c

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

2008-07-20 17:12:36 -07:00

vr41xx_siu.c

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

2008-07-20 17:12:36 -07:00

zs.c

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

2008-07-20 17:12:36 -07:00

zs.h

…