diff options
author | Olof Johansson <olof@lixom.net> | 2018-09-25 11:39:42 -0700 |
---|---|---|
committer | Olof Johansson <olof@lixom.net> | 2018-09-25 11:39:42 -0700 |
commit | 478bf0b470987a7d833999ff5066e3752182bf93 (patch) | |
tree | 2565fbc52cfee1c08553cb7250ead632751471d3 /block/blk-mq-sched.c | |
parent | 786bd99c91f50482fb9e2b828b203d7e8acc1b56 (diff) | |
parent | 7265b3d9ddaae3dfbda9b1d1436809a6d1b5da7f (diff) | |
download | linux-478bf0b470987a7d833999ff5066e3752182bf93.tar.gz linux-478bf0b470987a7d833999ff5066e3752182bf93.tar.bz2 linux-478bf0b470987a7d833999ff5066e3752182bf93.zip |
Merge tag 'hisi-defconfig-for-4.20' of git://github.com/hisilicon/linux-hisi into next/defconfig
ARM64: hisilicon: defconfig updates for 4.20
- Enable integrated NIC driver(hns3) for hisilicon SoCs
- Enable PCIe Port bus to support some PCIe features like
AER, hotplug, PME and DPC
* tag 'hisi-defconfig-for-4.20' of git://github.com/hisilicon/linux-hisi:
arm64: defconfig: Enable PCIEPORTBUS
arm64: defconfig: enable HiSilicon HNS3 driver
Signed-off-by: Olof Johansson <olof@lixom.net>
Diffstat (limited to 'block/blk-mq-sched.c')
0 files changed, 0 insertions, 0 deletions