diff options
author | Alex Shi <alex.shi@linaro.org> | 2017-04-07 16:50:41 +0800 |
---|---|---|
committer | Alex Shi <alex.shi@linaro.org> | 2017-04-07 16:50:41 +0800 |
commit | 11cbb42a86895b88ac906a6768c998f9e98a37e2 (patch) | |
tree | 3eaeec2cff4c7e34add793c77079cdc85b058bb8 /arch/arm/mach-pxa/xcep.c | |
parent | 95ffb43f1ba759fb1205a8ce38a7ea5bab6be02d (diff) | |
parent | 95bcc3e563748f65c9fc0eb1bbc3f99b76efd4b2 (diff) |
Merge remote-tracking branch 'origin/v4.4/topic/hibernate' into hikey-mainline-rebase-4.4hikey-hibernate-v4.4
Conflicts:
arch/arm64/Makefile
arch/arm64/kernel/arm64ksyms.c
arch/arm64/kernel/asm-offsets.c
arch/arm64/kvm/hyp/fpsimd.S
drivers/firmware/psci.c
fs/proc/task_mmu.c
mm/memcontrol.c
Diffstat (limited to 'arch/arm/mach-pxa/xcep.c')
-rw-r--r-- | arch/arm/mach-pxa/xcep.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/arch/arm/mach-pxa/xcep.c b/arch/arm/mach-pxa/xcep.c index 13b1d4586d7d..9001312710f7 100644 --- a/arch/arm/mach-pxa/xcep.c +++ b/arch/arm/mach-pxa/xcep.c @@ -120,7 +120,8 @@ static struct resource smc91x_resources[] = { }; static struct smc91x_platdata xcep_smc91x_info = { - .flags = SMC91X_USE_32BIT | SMC91X_NOWAIT | SMC91X_USE_DMA, + .flags = SMC91X_USE_8BIT | SMC91X_USE_16BIT | SMC91X_USE_32BIT | + SMC91X_NOWAIT | SMC91X_USE_DMA, }; static struct platform_device smc91x_device = { |