Skip to content

Commit 8c5e380

Browse files
committed
Merge branch 'at91-5.4-trunk/defconfig' into linux-5.4-at91
2 parents b1687df + c0f6242 commit 8c5e380

2 files changed

Lines changed: 0 additions & 4 deletions

File tree

arch/arm/configs/at91_dt_defconfig

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -79,7 +79,6 @@ CONFIG_BLK_DEV_LOOP=y
7979
CONFIG_BLK_DEV_RAM=y
8080
CONFIG_BLK_DEV_RAM_COUNT=4
8181
CONFIG_BLK_DEV_RAM_SIZE=8192
82-
CONFIG_ATMEL_TCLIB=y
8382
CONFIG_ATMEL_SSC=y
8483
CONFIG_EEPROM_AT24=y
8584
CONFIG_SCSI=y
@@ -225,7 +224,6 @@ CONFIG_AT91_SAMA5D2_ADC=y
225224
CONFIG_PWM=y
226225
CONFIG_PWM_ATMEL=y
227226
CONFIG_PWM_ATMEL_HLCDC_PWM=y
228-
CONFIG_PWM_ATMEL_TCB=y
229227
CONFIG_EXT4_FS=y
230228
CONFIG_FANOTIFY=y
231229
CONFIG_VFAT_FS=y

arch/arm/configs/sama5_defconfig

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -101,7 +101,6 @@ CONFIG_BLK_DEV_LOOP=y
101101
CONFIG_BLK_DEV_RAM=y
102102
CONFIG_BLK_DEV_RAM_COUNT=4
103103
CONFIG_BLK_DEV_RAM_SIZE=8192
104-
CONFIG_ATMEL_TCLIB=y
105104
CONFIG_ATMEL_SSC=y
106105
CONFIG_EEPROM_AT24=y
107106
CONFIG_SCSI=y
@@ -272,7 +271,6 @@ CONFIG_AT91_SAMA5D2_ADC=y
272271
CONFIG_PWM=y
273272
CONFIG_PWM_ATMEL=y
274273
CONFIG_PWM_ATMEL_HLCDC_PWM=y
275-
CONFIG_PWM_ATMEL_TCB=y
276274
CONFIG_EXT4_FS=y
277275
CONFIG_FANOTIFY=y
278276
CONFIG_OVERLAY_FS=y

0 commit comments

Comments
 (0)