Skip to content

Commit

Permalink
Merge tag 'samsung-soc-4.13' of git://git.kernel.org/pub/scm/linux/ke…
Browse files Browse the repository at this point in the history 
…rnel/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: Olof Johansson <olof@lixom.net>
  • Loading branch information
Olof Johansson committed Jun 19, 2017
2 parents 19cfdfd + 44fc41f commit 23dbd13
Showing 1 changed file with 0 additions and 1 deletion.
1 change: 0 additions & 1 deletion arch/arm/mach-s3c64xx/Kconfig
View file
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,6 @@ config CPU_S3C6410

config S3C64XX_PL080
def_bool DMADEVICES
select ARM_AMBA
select AMBA_PL08X

config S3C64XX_SETUP_SDHCI
Expand Down

0 comments on commit 23dbd13

Please sign in to comment.