diff options
| author | Olof Johansson <olof@lixom.net> | 2017-06-19 08:12:36 +0200 |
|---|---|---|
| committer | Olof Johansson <olof@lixom.net> | 2017-06-19 08:12:36 +0200 |
| commit | 17bc093e18a6e7c453ebbfff81c74531e7933897 (patch) | |
| tree | 28afe4ad4d3ec877182802aea227666e9f9b8d15 | |
| parent | Merge tag 'imx-soc-4.13' of git://git.kernel.org/pub/scm/linux/kernel/git/sha... (diff) | |
| parent | ARM: at91: select CONFIG_ARM_CPU_SUSPEND (diff) | |
| download | linux-17bc093e18a6e7c453ebbfff81c74531e7933897.tar.xz linux-17bc093e18a6e7c453ebbfff81c74531e7933897.zip | |
Merge tag 'at91-4.12-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/abelloni/linux into next/soc
Bring in the fixes branch to avoid a merge conflict between new SoC options and
the build fix adding CONFIG_AMR_CPU_SUSPEND.
Fixes for 4.12:
Fix two compilation issues
* tag 'at91-4.12-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/abelloni/linux:
ARM: at91: select CONFIG_ARM_CPU_SUSPEND
memory: atmel-ebi: mark PM ops as __maybe_unused
Signed-off-by: Olof Johansson <olof@lixom.net>
| -rw-r--r-- | arch/arm/mach-at91/Kconfig | 1 | ||||
| -rw-r--r-- | drivers/memory/atmel-ebi.c | 2 |
2 files changed, 2 insertions, 1 deletions
diff --git a/arch/arm/mach-at91/Kconfig b/arch/arm/mach-at91/Kconfig index 7497a28a79d1..d735e5fc4772 100644 --- a/arch/arm/mach-at91/Kconfig +++ b/arch/arm/mach-at91/Kconfig @@ -1,6 +1,7 @@ menuconfig ARCH_AT91 bool "Atmel SoCs" depends on ARCH_MULTI_V4T || ARCH_MULTI_V5 || ARCH_MULTI_V7 || ARM_SINGLE_ARMV7M + select ARM_CPU_SUSPEND if PM select COMMON_CLK_AT91 select GPIOLIB select PINCTRL diff --git a/drivers/memory/atmel-ebi.c b/drivers/memory/atmel-ebi.c index 35910f945bfa..99e644cda4d1 100644 --- a/drivers/memory/atmel-ebi.c +++ b/drivers/memory/atmel-ebi.c @@ -581,7 +581,7 @@ static int atmel_ebi_probe(struct platform_device *pdev) return of_platform_populate(np, NULL, NULL, dev); } -static int atmel_ebi_resume(struct device *dev) +static __maybe_unused int atmel_ebi_resume(struct device *dev) { struct atmel_ebi *ebi = dev_get_drvdata(dev); struct atmel_ebi_dev *ebid; |