Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 17bc093e authored by Olof Johansson's avatar Olof Johansson
Browse files

Merge tag 'at91-4.12-fixes' of... 

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: default avatarOlof Johansson <olof@lixom.net>
parents 67a87a94 cc7a938f

arch/arm/mach-at91/Kconfig

+1 −0
Original line number Diff line number Diff line 
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

drivers/memory/atmel-ebi.c

+1 −1
Original line number Diff line number Diff line
@@ -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;