diff options
| author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2015-03-23 21:45:24 +0100 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2015-03-23 21:45:24 +0100 |
| commit | caa445d808d27880f92d866902f6717f4d4cd3ca (patch) | |
| tree | c46a564ecbce58310436f0f30b8f3c6d5d93c19b /arch/arm/mach-pxa/lpd270.c | |
| parent | drivers/tty: serial: remove info message (diff) | |
| parent | Linux 4.0-rc5 (diff) | |
| download | linux-caa445d808d27880f92d866902f6717f4d4cd3ca.tar.xz linux-caa445d808d27880f92d866902f6717f4d4cd3ca.zip | |
Merge 4.0-rc5 into tty-next
We want the tty/serial fixes in here as well.
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'arch/arm/mach-pxa/lpd270.c')
| -rw-r--r-- | arch/arm/mach-pxa/lpd270.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/mach-pxa/lpd270.c b/arch/arm/mach-pxa/lpd270.c index 28da319d389f..eaee2c20b189 100644 --- a/arch/arm/mach-pxa/lpd270.c +++ b/arch/arm/mach-pxa/lpd270.c @@ -195,7 +195,7 @@ static struct resource smc91x_resources[] = { }; struct smc91x_platdata smc91x_platdata = { - .flags = SMC91X_USE_16BIT | SMC91X_NOWAIT; + .flags = SMC91X_USE_16BIT | SMC91X_NOWAIT, }; static struct platform_device smc91x_device = { |