Commit 2cb2b2c9 authored Jan 22, 2021 by Arnd Bergmann

Merge tag 'at91-defconfig-5.12' of...

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>

parents 26ba4a47 00a1aa47

arch/arm/configs/at91_dt_defconfig

+0 −1

Original line number	Original line	Diff line number	Diff line
	@@ -57,7 +57,6 @@ CONFIG_BLK_DEV_LOOP=y
	CONFIG_BLK_DEV_RAM=y		CONFIG_BLK_DEV_RAM=y
	CONFIG_BLK_DEV_RAM_COUNT=4		CONFIG_BLK_DEV_RAM_COUNT=4
	CONFIG_BLK_DEV_RAM_SIZE=8192		CONFIG_BLK_DEV_RAM_SIZE=8192
	CONFIG_ATMEL_TCLIB=y
	CONFIG_ATMEL_SSC=y		CONFIG_ATMEL_SSC=y
	CONFIG_SCSI=y		CONFIG_SCSI=y
	CONFIG_BLK_DEV_SD=y		CONFIG_BLK_DEV_SD=y

arch/arm/configs/multi_v5_defconfig

+0 −1

Original line number	Original line	Diff line number	Diff line
	@@ -105,7 +105,6 @@ CONFIG_MTD_SPI_NOR=y
	CONFIG_SPI_ASPEED_SMC=y		CONFIG_SPI_ASPEED_SMC=y
	CONFIG_MTD_UBI=y		CONFIG_MTD_UBI=y
	CONFIG_BLK_DEV_LOOP=y		CONFIG_BLK_DEV_LOOP=y
	CONFIG_ATMEL_TCLIB=y
	CONFIG_ATMEL_SSC=m		CONFIG_ATMEL_SSC=m
	CONFIG_EEPROM_AT24=y		CONFIG_EEPROM_AT24=y
	# CONFIG_SCSI_PROC_FS is not set		# CONFIG_SCSI_PROC_FS is not set

arch/arm/configs/multi_v7_defconfig

+0 −1

Original line number	Original line	Diff line number	Diff line
	@@ -224,7 +224,6 @@ CONFIG_BLK_DEV_RAM_SIZE=65536
	CONFIG_VIRTIO_BLK=y		CONFIG_VIRTIO_BLK=y
	CONFIG_AD525X_DPOT=y		CONFIG_AD525X_DPOT=y
	CONFIG_AD525X_DPOT_I2C=y		CONFIG_AD525X_DPOT_I2C=y
	CONFIG_ATMEL_TCLIB=y
	CONFIG_ICS932S401=y		CONFIG_ICS932S401=y
	CONFIG_ATMEL_SSC=m		CONFIG_ATMEL_SSC=m
	CONFIG_QCOM_COINCELL=m		CONFIG_QCOM_COINCELL=m

arch/arm/configs/sama5_defconfig

+0 −1

Original line number	Original line	Diff line number	Diff line
	@@ -78,7 +78,6 @@ CONFIG_BLK_DEV_LOOP=y
	CONFIG_BLK_DEV_RAM=y		CONFIG_BLK_DEV_RAM=y
	CONFIG_BLK_DEV_RAM_COUNT=4		CONFIG_BLK_DEV_RAM_COUNT=4
	CONFIG_BLK_DEV_RAM_SIZE=8192		CONFIG_BLK_DEV_RAM_SIZE=8192
	CONFIG_ATMEL_TCLIB=y
	CONFIG_ATMEL_SSC=y		CONFIG_ATMEL_SSC=y
	CONFIG_EEPROM_AT24=y		CONFIG_EEPROM_AT24=y
	CONFIG_SCSI=y		CONFIG_SCSI=y