diff options
| author | Vincent Guittot <vincent.guittot@linaro.org> | 2015-04-22 19:06:16 +0200 |
|---|---|---|
| committer | Vincent Guittot <vincent.guittot@linaro.org> | 2015-04-22 19:06:16 +0200 |
| commit | 3cde65c1f7add76c3dd25b41fc74fcf6125dadfb (patch) | |
| tree | fc08713248e55feb5c638f2b050db3b3e1bad4b7 /arch/arm/mach-pxa/lpd270.c | |
| parent | b41956e379a4ff28e70660c51577c6c7988809b1 (diff) | |
| parent | 1fa8fefbfd4e269248a0d428143b7d16f5b6f4ef (diff) | |
Merge branch 'test-sched-tasks-packing' into test-sched-tasks-packing-cb2test-sched-tasks-packing-cb2
Conflicts:
arch/arm/boot/dts/exynos4210.dtsi
arch/arm/boot/dts/exynos5250.dtsi
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 = { |