aboutsummaryrefslogtreecommitdiffstats
path: root/arch/arm/configs/multi_v7_defconfig
diff options
context:
space:
mode:
authorArnd Bergmann <arnd@arndb.de>2021-01-22 15:56:53 +0100
committerArnd Bergmann <arnd@arndb.de>2021-01-22 15:56:54 +0100
commit2cb2b2c9d9f06356d8b00e8afdfc3d8449c3dd95 (patch)
tree403aa220b3abeb9e6a2d6af2908103f00cedce0e /arch/arm/configs/multi_v7_defconfig
parentARM: multi_v7_defconfig: Enable Actions Semi platform and drivers (diff)
parentARM: configs: multi_{v5,v7}: remove ATMEL_TCLIB (diff)
downloadlinux-dev-2cb2b2c9d9f06356d8b00e8afdfc3d8449c3dd95.tar.xz
linux-dev-2cb2b2c9d9f06356d8b00e8afdfc3d8449c3dd95.zip
Merge tag 'at91-defconfig-5.12' of git://git.kernel.org/pub/scm/linux/kernel/git/at91/linux into arm/defconfig
AT91 defconfig for 5.12: - remove ATMEL_TCLIB as the driver was deleted * tag 'at91-defconfig-5.12' of git://git.kernel.org/pub/scm/linux/kernel/git/at91/linux: ARM: configs: multi_{v5,v7}: remove ATMEL_TCLIB ARM: configs: at91: remove ATMEL_TCLIB Link: https://lore.kernel.org/r/20210122144638.170565-1-nicolas.ferre@microchip.com Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Diffstat (limited to 'arch/arm/configs/multi_v7_defconfig')
-rw-r--r--arch/arm/configs/multi_v7_defconfig1
1 files changed, 0 insertions, 1 deletions
diff --git a/arch/arm/configs/multi_v7_defconfig b/arch/arm/configs/multi_v7_defconfig
index 99f8815ef753..6453f1a4ad6b 100644
--- a/arch/arm/configs/multi_v7_defconfig
+++ b/arch/arm/configs/multi_v7_defconfig
@@ -224,7 +224,6 @@ CONFIG_BLK_DEV_RAM_SIZE=65536
CONFIG_VIRTIO_BLK=y
CONFIG_AD525X_DPOT=y
CONFIG_AD525X_DPOT_I2C=y
-CONFIG_ATMEL_TCLIB=y
CONFIG_ICS932S401=y
CONFIG_ATMEL_SSC=m
CONFIG_QCOM_COINCELL=m