diff options
| author | Arnd Bergmann <[email protected]> | 2020-03-25 16:49:19 +0100 |
|---|---|---|
| committer | Arnd Bergmann <[email protected]> | 2020-03-25 16:49:20 +0100 |
| commit | c824d107e0c6340cb98b31e824dbe5d4f7e2a357 (patch) | |
| tree | 938c5001dc481d19df2be4f449ea727acd6a651e | |
| parent | 6825444ac367b450b93fbb5d275b94279f54b49d (diff) | |
| parent | d698e544e2107e3e161ddbb3a28324197ecd537f (diff) | |
Merge tag 'hisi-arm64-defconfig-for-5.7' of git://github.com/hisilicon/linux-hisi into arm/config
ARM64: hisilicon: defconfig updates for 5.7
- Enable MEGARAID_SAS to be able to boot from
disk for the D06CS development board
* tag 'hisi-arm64-defconfig-for-5.7' of git://github.com/hisilicon/linux-hisi:
arm64: defconfig: Enable MEGARAID_SAS
Link: https://lore.kernel.org/r/[email protected]
Signed-off-by: Arnd Bergmann <[email protected]>
| -rw-r--r-- | arch/arm64/configs/defconfig | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/arm64/configs/defconfig b/arch/arm64/configs/defconfig index f824de247f9d..742e7269abfc 100644 --- a/arch/arm64/configs/defconfig +++ b/arch/arm64/configs/defconfig @@ -229,6 +229,7 @@ CONFIG_BLK_DEV_SD=y CONFIG_SCSI_SAS_ATA=y CONFIG_SCSI_HISI_SAS=y CONFIG_SCSI_HISI_SAS_PCI=y +CONFIG_MEGARAID_SAS=y CONFIG_SCSI_MPT3SAS=m CONFIG_SCSI_UFSHCD=y CONFIG_SCSI_UFSHCD_PLATFORM=y |