summaryrefslogtreecommitdiff
path: root/include/linux/zstd_lib.h
diff options
context:
space:
mode:
authorQuentin Schulz <[email protected]>2023-01-17 18:26:54 +0100
committerKever Yang <[email protected]>2023-02-28 18:07:26 +0800
commit5bb4697ca3b731a4153a26da7a742b8360667658 (patch)
tree48c1802b74d9fbe46196cfe073a940ba5d5fabdb /include/linux/zstd_lib.h
parentea0f7662531fd360abf300691c85ceff5a0d0397 (diff)
rockchip: ringneck: fix SDRAM init fail
CONFIG_RAM_PX30_DDR4 got renamed to CONFIG_RAM_ROCKCHIP_DDR4 in commit 26f92be07e2a ("ram: rockchip: Add common ddr type configs"). Since both patchsets were merged unbeknownst to the other, the conflict wasn't detected while testing each patchset individually and could only be observed after a merge to master branch. Fixes: c925be73a0a8 ("rockchip: add support for PX30 Ringneck SoM on Haikou Devkit") Cc: Quentin Schulz <[email protected]> Signed-off-by: Quentin Schulz <[email protected]> Reviewed-by: Kever Yang <[email protected]> Signed-off-by: Kever Yang <[email protected]>
Diffstat (limited to 'include/linux/zstd_lib.h')
0 files changed, 0 insertions, 0 deletions