aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
authorOlof Johansson <olof@lixom.net>2017-06-18 22:56:48 -0700
committerOlof Johansson <olof@lixom.net>2017-06-18 22:56:48 -0700
commitde9761ad4e599216ecaa9f3a373369453dd7837f (patch)
treea154cdee58316b4e8b001301c67cc7e848109405
parentMerge tag 'at91-ab-4.13-defconfig' of git://git.kernel.org/pub/scm/linux/kernel/git/abelloni/linux into next/defconfig (diff)
parentARM: mvebu: Enable SENSORS_PWM_FAN in defconfig (diff)
downloadwireguard-linux-de9761ad4e599216ecaa9f3a373369453dd7837f.tar.xz
wireguard-linux-de9761ad4e599216ecaa9f3a373369453dd7837f.zip
Merge tag 'mvebu-defconfig-4.13-1' of git://git.infradead.org/linux-mvebu into next/defconfig
mvebu defconfig for 4.13 Enable the SENSORS_PWM_FAN in mvebu_v7_defconfig support by gpio driver since the previous release * tag 'mvebu-defconfig-4.13-1' of git://git.infradead.org/linux-mvebu: ARM: mvebu: Enable SENSORS_PWM_FAN in defconfig Signed-off-by: Olof Johansson <olof@lixom.net>
-rw-r--r--arch/arm/configs/mvebu_v7_defconfig2
1 files changed, 2 insertions, 0 deletions
diff --git a/arch/arm/configs/mvebu_v7_defconfig b/arch/arm/configs/mvebu_v7_defconfig
index f1a0e2503cbe..69553704f2dc 100644
--- a/arch/arm/configs/mvebu_v7_defconfig
+++ b/arch/arm/configs/mvebu_v7_defconfig
@@ -135,6 +135,8 @@ CONFIG_DMADEVICES=y
CONFIG_MV_XOR=y
# CONFIG_IOMMU_SUPPORT is not set
CONFIG_MEMORY=y
+CONFIG_PWM=y
+CONFIG_SENSORS_PWM_FAN=y
CONFIG_EXT4_FS=y
CONFIG_ISO9660_FS=y
CONFIG_JOLIET=y