diff options
| author | Arnd Bergmann | 2017-02-16 17:19:26 +0100 |
|---|---|---|
| committer | Arnd Bergmann | 2017-02-16 17:19:26 +0100 |
| commit | 8b71d5ed2fab3030d46bffdcebe4395215c86821 (patch) | |
| tree | 344e12071e337c99c051073f8dba6a0f2b4d9b13 /arch/arm | |
| parent | 4f3a468666f78625142529434a51edf13c3acfed (diff) | |
| parent | 484290350c8d6ec119d255304ff32d7e255ed208 (diff) | |
Merge tag 'davinci-for-v4.11/defconfig-2' of git://git.kernel.org/pub/scm/linux/kernel/git/nsekhar/linux-davinci into next/defconfig
Pull "Enable SATA support found on DA850 SoC" from Sekhar Nori:
* tag 'davinci-for-v4.11/defconfig-2' of git://git.kernel.org/pub/scm/linux/kernel/git/nsekhar/linux-davinci:
ARM: davinci_all_defconfig: enable SATA modules
Diffstat (limited to 'arch/arm')
| -rw-r--r-- | arch/arm/configs/davinci_all_defconfig | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/arch/arm/configs/davinci_all_defconfig b/arch/arm/configs/davinci_all_defconfig index 8cc040936ae7..c8663eac9b1b 100644 --- a/arch/arm/configs/davinci_all_defconfig +++ b/arch/arm/configs/davinci_all_defconfig @@ -78,6 +78,8 @@ CONFIG_IDE=m CONFIG_BLK_DEV_PALMCHIP_BK3710=m CONFIG_SCSI=m CONFIG_BLK_DEV_SD=m +CONFIG_ATA=m +CONFIG_AHCI_DA850=m CONFIG_NETDEVICES=y CONFIG_NETCONSOLE=y CONFIG_TUN=m |