diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2017-08-15 18:06:32 +0200 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2017-08-15 18:06:32 +0200 |
| commit | 4d3ae0d17336b8e7e2e1416ef036a7cb1b8af449 (patch) | |
| tree | ab91a9c7e4848b9110fbe097622b73f00eeaa0ec /drivers/vme | |
| parent | f736eb382b6733f083528149a562d4c09723b717 (diff) | |
| parent | 4bd68d6038ffdcf5792fb7705bfd84caaaf39b2e (diff) | |
Merge tag 'hisi-defconfig-for-4.14' of git://github.com/hisilicon/linux-hisi into next/arm64
Pull "ARM64: hisilicon: defconfig updates for 4.14" from Wei Xu:
- Enable Kirin PCIe host, hi6421v530 mfd and regulator,
syscon reboot mode, serdev bus, OP-TEE and K3 DMA support
for hikey and hikey960
- Enable pcie based sas controller support for hip08 SoC
* tag 'hisi-defconfig-for-4.14' of git://github.com/hisilicon/linux-hisi:
arm64: defconfig: enable DMA driver for hi3660
arm64: defconfig: enable OP-TEE
arm64: defconfig: enable support for serial port connected device
arm64: defconfig: enable CONFIG_SYSCON_REBOOT_MODE
arm64: defconfig: enable support hi6421v530 PMIC
arm64: defconfig: enable Kirin PCIe
arm64: defconfig: enable SCSI_HISI_SAS_PCI
Diffstat (limited to 'drivers/vme')
0 files changed, 0 insertions, 0 deletions