Skip to content

Commit 4f3c954

Browse files
mrfixit2001ayufan
authored andcommitted
Fix compile error (torvalds#26)
Multiple definition error due to midgard and bifrost both selected
1 parent 56d1669 commit 4f3c954

File tree

1 file changed

+1
-6
lines changed

1 file changed

+1
-6
lines changed

arch/arm64/configs/rockchip_linux_defconfig

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -879,13 +879,8 @@ CONFIG_MALI_EXPERT=y
879879
CONFIG_MALI_PLATFORM_THIRDPARTY=y
880880
CONFIG_MALI_PLATFORM_THIRDPARTY_NAME="rk"
881881
CONFIG_MALI_DEBUG=y
882-
CONFIG_MALI_PWRSOFT_765=y
883-
CONFIG_MALI_BIFROST_FOR_LINUX=y
884-
CONFIG_MALI_BIFROST=y
885-
CONFIG_MALI_BIFROST_DEVFREQ=y
886882
CONFIG_MALI_PLATFORM_NAME="rk"
887-
CONFIG_MALI_BIFROST_EXPERT=y
888-
CONFIG_MALI_BIFROST_DEBUG=y
883+
CONFIG_MALI_PWRSOFT_765=y
889884
CONFIG_BACKLIGHT_LCD_SUPPORT=y
890885
# CONFIG_LCD_CLASS_DEVICE is not set
891886
CONFIG_BACKLIGHT_CLASS_DEVICE=y

0 commit comments

Comments
 (0)