From 2697fce9bc9e7688536fefc7ab10aa649d3db669 Mon Sep 17 00:00:00 2001
From: Thomas Backlund <tmb@mageia.org>
Date: Sun, 31 Jan 2021 12:09:19 +0200
Subject: revert 'add info for amdgpu vs radeon conflicts'

---
 NEWS                        | 1 +
 tools/display_driver_helper | 4 ++--
 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.
-- 
cgit v1.2.1