28c28
< __FBSDID("$FreeBSD: stable/10/sys/dev/uart/uart_dev_pl011.c 262649 2014-03-01 04:16:54Z imp $");
---
> __FBSDID("$FreeBSD: stable/10/sys/dev/uart/uart_dev_pl011.c 283321 2015-05-23 19:27:04Z ian $");
50a51
> #define FR_TXFF (1 << 5) /* Transmit FIFO/reg full */
197c198,199
< while (!(__uart_getreg(bas, UART_FR) & FR_TXFE))
---
> /* Wait when TX FIFO full. Push character otherwise. */
> while (__uart_getreg(bas, UART_FR) & FR_TXFF)