diff options
| author | Olof Johansson <olof@lixom.net> | 2017-06-19 04:11:30 +0200 |
|---|---|---|
| committer | Olof Johansson <olof@lixom.net> | 2017-06-19 04:11:30 +0200 |
| commit | 23dbd13d778d879f686e231c101478aa355b4ec5 (patch) | |
| tree | b9c8565c43bf104716a71f680bca08bb965d7d13 /arch/arm | |
| parent | Merge tag 'v4.13-rockchip-soc32-1' of git://git.kernel.org/pub/scm/linux/kern... (diff) | |
| parent | ARM: s3c64xx: Do not select ARM_AMBA from S3C64XX_PL080 (diff) | |
| download | linux-23dbd13d778d879f686e231c101478aa355b4ec5.tar.xz linux-23dbd13d778d879f686e231c101478aa355b4ec5.zip | |
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: Olof Johansson <olof@lixom.net>
Diffstat (limited to 'arch/arm')
| -rw-r--r-- | arch/arm/mach-s3c64xx/Kconfig | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/arch/arm/mach-s3c64xx/Kconfig b/arch/arm/mach-s3c64xx/Kconfig index 459214fa20b4..5ee5ad74a3d6 100644 --- a/arch/arm/mach-s3c64xx/Kconfig +++ b/arch/arm/mach-s3c64xx/Kconfig @@ -40,7 +40,6 @@ config CPU_S3C6410 config S3C64XX_PL080 def_bool DMADEVICES - select ARM_AMBA select AMBA_PL08X config S3C64XX_SETUP_SDHCI |