diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2022-03-08 16:42:53 +0100 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2022-03-08 16:42:54 +0100 |
| commit | 9a5872bab1c728f8e1b63a373aa3d34a0da8382c (patch) | |
| tree | 8d35af644b6f9afa2c5b78479fde685277548b9e /arch/arm/configs | |
| parent | c807a335d3b1691028831e723a481efd2ccb52c6 (diff) | |
| parent | 5f5399843c0ec3bd562dfd533f32e4074ca90314 (diff) | |
| download | linux-9a5872bab1c728f8e1b63a373aa3d34a0da8382c.tar.bz2 | |
Merge tag 'at91-defconfig-5.18-2' of git://git.kernel.org/pub/scm/linux/kernel/git/at91/linux into arm/defconfig
AT91: defconfig #2 for 5.18:
- Add EIC, remove DMATEST to sama7_defconfig
* tag 'at91-defconfig-5.18-2' of git://git.kernel.org/pub/scm/linux/kernel/git/at91/linux:
ARM: configs: at91: sama7: Unselect CONFIG_DMATEST
ARM: configs: at91: add eic
Link: https://lore.kernel.org/r/20220304144746.23779-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/sama7_defconfig | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/configs/sama7_defconfig b/arch/arm/configs/sama7_defconfig index aad10ae85a7d..07b0494ef743 100644 --- a/arch/arm/configs/sama7_defconfig +++ b/arch/arm/configs/sama7_defconfig @@ -181,7 +181,6 @@ CONFIG_RTC_DRV_AT91RM9200=y CONFIG_RTC_DRV_AT91SAM9=y CONFIG_DMADEVICES=y CONFIG_AT_XDMAC=y -CONFIG_DMATEST=y CONFIG_STAGING=y CONFIG_MICROCHIP_PIT64B=y # CONFIG_IOMMU_SUPPORT is not set @@ -190,6 +189,7 @@ CONFIG_IIO_SW_TRIGGER=y CONFIG_AT91_SAMA5D2_ADC=y CONFIG_PWM=y CONFIG_PWM_ATMEL=y +CONFIG_MCHP_EIC=y CONFIG_EXT2_FS=y CONFIG_EXT3_FS=y CONFIG_FANOTIFY=y |