diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2021-01-22 17:56:53 +0300 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2021-01-22 17:56:54 +0300 |
| commit | 2cb2b2c9d9f06356d8b00e8afdfc3d8449c3dd95 (patch) | |
| tree | 403aa220b3abeb9e6a2d6af2908103f00cedce0e /arch/arm/configs | |
| parent | 26ba4a474aec5998e52826319c4d7a1c98e8fab5 (diff) | |
| parent | 00a1aa475f507454fab82f02c6230c8fb2312a12 (diff) | |
| download | linux-2cb2b2c9d9f06356d8b00e8afdfc3d8449c3dd95.tar.xz | |
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')
| -rw-r--r-- | arch/arm/configs/at91_dt_defconfig | 1 | ||||
| -rw-r--r-- | arch/arm/configs/multi_v5_defconfig | 1 | ||||
| -rw-r--r-- | arch/arm/configs/multi_v7_defconfig | 1 | ||||
| -rw-r--r-- | arch/arm/configs/sama5_defconfig | 1 |
4 files changed, 0 insertions, 4 deletions
diff --git a/arch/arm/configs/at91_dt_defconfig b/arch/arm/configs/at91_dt_defconfig index c0c219d53b24..5f3415c743ec 100644 --- a/arch/arm/configs/at91_dt_defconfig +++ b/arch/arm/configs/at91_dt_defconfig @@ -57,7 +57,6 @@ CONFIG_BLK_DEV_LOOP=y CONFIG_BLK_DEV_RAM=y CONFIG_BLK_DEV_RAM_COUNT=4 CONFIG_BLK_DEV_RAM_SIZE=8192 -CONFIG_ATMEL_TCLIB=y CONFIG_ATMEL_SSC=y CONFIG_SCSI=y CONFIG_BLK_DEV_SD=y diff --git a/arch/arm/configs/multi_v5_defconfig b/arch/arm/configs/multi_v5_defconfig index e00be9faa23b..81c45d1baba6 100644 --- a/arch/arm/configs/multi_v5_defconfig +++ b/arch/arm/configs/multi_v5_defconfig @@ -105,7 +105,6 @@ CONFIG_MTD_SPI_NOR=y CONFIG_SPI_ASPEED_SMC=y CONFIG_MTD_UBI=y CONFIG_BLK_DEV_LOOP=y -CONFIG_ATMEL_TCLIB=y CONFIG_ATMEL_SSC=m CONFIG_EEPROM_AT24=y # CONFIG_SCSI_PROC_FS is not set 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 diff --git a/arch/arm/configs/sama5_defconfig b/arch/arm/configs/sama5_defconfig index 5f6297e6c549..d3e0d4d79424 100644 --- a/arch/arm/configs/sama5_defconfig +++ b/arch/arm/configs/sama5_defconfig @@ -78,7 +78,6 @@ CONFIG_BLK_DEV_LOOP=y CONFIG_BLK_DEV_RAM=y CONFIG_BLK_DEV_RAM_COUNT=4 CONFIG_BLK_DEV_RAM_SIZE=8192 -CONFIG_ATMEL_TCLIB=y CONFIG_ATMEL_SSC=y CONFIG_EEPROM_AT24=y CONFIG_SCSI=y |