From 5751401d433f8e288d906c8515ca3e64fd342101 Mon Sep 17 00:00:00 2001 From: Richard Weinberger Date: Mon, 22 Feb 2016 11:23:44 +0000 Subject: [PATCH] UPSTREAM: nvmem: Fix dependencies for !HAS_IOMEM archs Not every arch has io memory. So, unbreak the build by fixing the dependencies. Change-Id: Id5983c06d5b2627516c1622c44231ba426212b9a Signed-off-by: Richard Weinberger Signed-off-by: Srinivas Kandagatla Signed-off-by: Greg Kroah-Hartman Signed-off-by: Finley Xiao (cherry pick from 5685e24446ab9aa0a529cf87a69ad73f4775888a) --- drivers/nvmem/Kconfig | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/drivers/nvmem/Kconfig b/drivers/nvmem/Kconfig index bc4ea585b42e..c675ee9b14c3 100644 --- a/drivers/nvmem/Kconfig +++ b/drivers/nvmem/Kconfig @@ -28,6 +28,7 @@ config NVMEM_IMX_OCOTP config NVMEM_MXS_OCOTP tristate "Freescale MXS On-Chip OTP Memory Support" depends on ARCH_MXS || COMPILE_TEST + depends on HAS_IOMEM help If you say Y here, you will get readonly access to the One Time Programmable memory pages that are stored @@ -39,6 +40,7 @@ config NVMEM_MXS_OCOTP config QCOM_QFPROM tristate "QCOM QFPROM Support" depends on ARCH_QCOM || COMPILE_TEST + depends on HAS_IOMEM select REGMAP_MMIO help Say y here to enable QFPROM support. The QFPROM provides access @@ -50,6 +52,7 @@ config QCOM_QFPROM config ROCKCHIP_EFUSE tristate "Rockchip eFuse Support" depends on ARCH_ROCKCHIP || COMPILE_TEST + depends on HAS_IOMEM help This is a simple drive to dump specified values of Rockchip SoC from eFuse, such as cpu-leakage. @@ -71,6 +74,7 @@ config NVMEM_SUNXI_SID config NVMEM_VF610_OCOTP tristate "VF610 SoC OCOTP support" depends on SOC_VF610 || COMPILE_TEST + depends on HAS_IOMEM help This is a driver for the 'OCOTP' peripheral available on Vybrid devices like VF5xx and VF6xx. -- 2.34.1