diff options
| author | Olof Johansson <olof@lixom.net> | 2016-02-24 16:56:20 -0800 |
|---|---|---|
| committer | Olof Johansson <olof@lixom.net> | 2016-02-24 16:56:20 -0800 |
| commit | 1a2a8de6909ff0e6867767d8fa2b75c9275cfa6f (patch) | |
| tree | 742941536d0be10b84498b7697019b4b2799c528 /arch/arm/configs | |
| parent | 7f544a510954a62b7405477a7b6a2ae25dda0b56 (diff) | |
| parent | 48a2e12adb7f4d1a03720d3923bedbc13ab96143 (diff) | |
Merge tag 'at91-ab-4.6-defconfig' of git://git.kernel.org/pub/scm/linux/kernel/git/abelloni/linux into next/defconfig
defconfig update for 4.6:
- Addition of sama5d2 ADC to sama5_defconfig
* tag 'at91-ab-4.6-defconfig' of git://git.kernel.org/pub/scm/linux/kernel/git/abelloni/linux:
ARM: at91/defconfig: add sama5d2 adc support in sama5_defconfig
Signed-off-by: Olof Johansson <olof@lixom.net>
Diffstat (limited to 'arch/arm/configs')
| -rw-r--r-- | arch/arm/configs/sama5_defconfig | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/arm/configs/sama5_defconfig b/arch/arm/configs/sama5_defconfig index c11bab735125..afbda413d61a 100644 --- a/arch/arm/configs/sama5_defconfig +++ b/arch/arm/configs/sama5_defconfig @@ -187,6 +187,7 @@ CONFIG_AT_XDMAC=y # CONFIG_IOMMU_SUPPORT is not set CONFIG_IIO=y CONFIG_AT91_ADC=y +CONFIG_AT91_SAMA5D2_ADC=y CONFIG_PWM=y CONFIG_PWM_ATMEL=y CONFIG_PWM_ATMEL_TCB=y |