diff options
| -rw-r--r-- | NEWS | 1 | ||||
| -rw-r--r-- | tools/display_driver_helper | 4 |
2 files changed, 3 insertions, 2 deletions
@@ -1,4 +1,5 @@ - don't run mageia-setup-keyboard on Live systems (mga#23946) +- revert 'add info for amdgpu vs radeon conflicts' Version 1.32 - 24 January 2021 diff --git a/tools/display_driver_helper b/tools/display_driver_helper index b5ba56c..4e89229 100644 --- a/tools/display_driver_helper +++ b/tools/display_driver_helper @@ -41,10 +41,10 @@ XORG_nouveau="nouveau" CONFLICTS_nouveau="nv nvidia" XORG_radeon="ati radeon" -CONFLICTS_radeon="fglrx amdgpu" +CONFLICTS_radeon="fglrx" XORG_amdgpu="amdgpu" -CONFLICTS_amdgpu="ati radeon" +CONFLICTS_amdgpu="" # Note: no /usr # See end of script for descriptions of global variables. |