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

Commit 23dbd13d authored by Olof Johansson's avatar Olof Johansson
Browse files

Merge tag 'samsung-soc-4.13' of...

Merge tag 'samsung-soc-4.13' of git://git.kernel.org/pub/scm/linux/kernel/git/krzk/linux into next/soc

Samsung mach/soc update for v4.13:
1. Fix possible circular Kconfig dependency on S3C64xx.

* tag 'samsung-soc-4.13' of git://git.kernel.org/pub/scm/linux/kernel/git/krzk/linux

:
  ARM: s3c64xx: Do not select ARM_AMBA from S3C64XX_PL080

Signed-off-by: default avatarOlof Johansson <olof@lixom.net>
parents 19cfdfd6 44fc41f9
Loading
Loading
Loading
Loading
+0 −1
Original line number Diff line number Diff line
@@ -40,7 +40,6 @@ config CPU_S3C6410

config S3C64XX_PL080
	def_bool DMADEVICES
	select ARM_AMBA
	select AMBA_PL08X

config S3C64XX_SETUP_SDHCI