diff options
| author | Olof Johansson <olof@lixom.net> | 2017-04-19 05:29:00 -0700 |
|---|---|---|
| committer | Olof Johansson <olof@lixom.net> | 2017-04-19 05:29:00 -0700 |
| commit | d08c78fa10d238bc5359814653bfc9eb10ce8132 (patch) | |
| tree | aa8af3f84823b387c0ff8c5360a0830e11e407b1 /arch/arm/configs | |
| parent | 336a8b145e94db90b11a5ef1c338531d3fd3014e (diff) | |
| parent | 2e5d77ef042a22fa1aa393a294999d28f7136d27 (diff) | |
Merge tag 'davinci-for-v4.12/defconfig-2' of git://git.kernel.org/pub/scm/linux/kernel/git/nsekhar/linux-davinci into next/defconfig
Shift to the newly introduced PalmChip
PATA driver for DaVinci.
* tag 'davinci-for-v4.12/defconfig-2' of git://git.kernel.org/pub/scm/linux/kernel/git/nsekhar/linux-davinci:
ARM: davinci_all_defconfig: convert to use libata PATA
Signed-off-by: Olof Johansson <olof@lixom.net>
Diffstat (limited to 'arch/arm/configs')
| -rw-r--r-- | arch/arm/configs/davinci_all_defconfig | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/arch/arm/configs/davinci_all_defconfig b/arch/arm/configs/davinci_all_defconfig index b9a7cb98ffda..67db82999c06 100644 --- a/arch/arm/configs/davinci_all_defconfig +++ b/arch/arm/configs/davinci_all_defconfig @@ -74,12 +74,10 @@ CONFIG_BLK_DEV_RAM=y CONFIG_BLK_DEV_RAM_COUNT=1 CONFIG_BLK_DEV_RAM_SIZE=32768 CONFIG_EEPROM_AT24=y -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_PATA_BK3710=m CONFIG_NETDEVICES=y CONFIG_NETCONSOLE=y CONFIG_TUN=m |