diff options
| author | Greg Kroah-Hartman <gregkh@suse.de> | 2010-09-05 00:28:47 -0700 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@suse.de> | 2010-09-05 00:28:47 -0700 |
| commit | 5147a136f3ade69b9ce12afc022b1c37d43cf5d8 (patch) | |
| tree | a33af1b06f2000ab82cc0527442de108c668843c /tty | |
| parent | eea487fa0daadea3dbe2c25b9db5881976643e09 (diff) | |
| parent | 470ec5b9affc1625ee67df9e74701e51973d7cdf (diff) | |
| download | patches-5147a136f3ade69b9ce12afc022b1c37d43cf5d8.tar.gz | |
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/gregkh/patches
Conflicts:
series
Diffstat (limited to 'tty')
| -rw-r--r-- | tty/serial-add-console_poll-support-for-uartlite.patch | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/tty/serial-add-console_poll-support-for-uartlite.patch b/tty/serial-add-console_poll-support-for-uartlite.patch index c03313ffac5323..814685da208830 100644 --- a/tty/serial-add-console_poll-support-for-uartlite.patch +++ b/tty/serial-add-console_poll-support-for-uartlite.patch @@ -29,7 +29,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> +#ifdef CONFIG_CONSOLE_POLL +static int ulite_get_poll_char(struct uart_port *port) +{ -+ while (!(ioread32be(port->membase + ULITE_STATUS) ++ if (!(ioread32be(port->membase + ULITE_STATUS) + & ULITE_STATUS_RXVALID)) + return NO_POLL_CHAR; + |