diff options
| author |   Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2018-10-08 15:43:12 +0200 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2018-10-08 15:43:12 +0200 |
| commit | 4e1a606d552de03aec2b1fd157011bf012fcc870 (patch) | |
| tree | 7d7683fc2d5286a36782df572f475abb3bb2e173 /drivers/tty/serial/8250 | |
| parent | TTY: sn_console: Replace spin_is_locked() with spin_trylock() (diff) | |
| parent | Linux 4.19-rc7 (diff) | |
| download | linux-dev-4e1a606d552de03aec2b1fd157011bf012fcc870.tar.xz linux-dev-4e1a606d552de03aec2b1fd157011bf012fcc870.zip | |
Merge 4.19-rc7 into tty-next
We want the fixes in here as well.
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/tty/serial/8250')
| -rw-r--r-- | drivers/tty/serial/8250/8250_dw.c | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/drivers/tty/serial/8250/8250_dw.c b/drivers/tty/serial/8250/8250_dw.c index fa8dcb470640..d31b975dd3fd 100644 --- a/drivers/tty/serial/8250/8250_dw.c +++ b/drivers/tty/serial/8250/8250_dw.c @@ -630,10 +630,6 @@ static int dw8250_probe(struct platform_device *pdev) if (!data->skip_autocfg) dw8250_setup_port(p); -#ifdef CONFIG_PM - uart.capabilities |= UART_CAP_RPM; -#endif - /* If we have a valid fifosize, try hooking up DMA */ if (p->fifosize) { data->dma.rxconf.src_maxburst = p->fifosize / 4; |