summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThomas Backlund <tmb@mageia.org>2021-01-31 12:09:19 +0200
committerThomas Backlund <tmb@mageia.org>2021-01-31 12:09:19 +0200
commit2697fce9bc9e7688536fefc7ab10aa649d3db669 (patch)
tree5b6348c547cc082f2c139d4e8b637ab70efed206
parent45335b5b0fbd306a50f6e00fb68fd8ad4fbd6e78 (diff)
downloaddrakx-kbd-mouse-x11-2697fce9bc9e7688536fefc7ab10aa649d3db669.tar
drakx-kbd-mouse-x11-2697fce9bc9e7688536fefc7ab10aa649d3db669.tar.gz
drakx-kbd-mouse-x11-2697fce9bc9e7688536fefc7ab10aa649d3db669.tar.bz2
drakx-kbd-mouse-x11-2697fce9bc9e7688536fefc7ab10aa649d3db669.tar.xz
drakx-kbd-mouse-x11-2697fce9bc9e7688536fefc7ab10aa649d3db669.zip
revert 'add info for amdgpu vs radeon conflicts'
-rw-r--r--NEWS1
-rw-r--r--tools/display_driver_helper4
2 files changed, 3 insertions, 2 deletions
diff --git a/NEWS b/NEWS
index c2f0a3e..f5cdf91 100644
--- a/NEWS
+++ b/NEWS
@@ -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.