From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 522B11396D1 for ; Thu, 7 Sep 2017 00:53:01 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 6B392E0DF3; Thu, 7 Sep 2017 00:53:00 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 4E6ABE0DF3 for ; Thu, 7 Sep 2017 00:53:00 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 2AC163402FE for ; Thu, 7 Sep 2017 00:52:59 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 930588E42 for ; Thu, 7 Sep 2017 00:52:57 +0000 (UTC) From: "Robin H. Johnson" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Robin H. Johnson" Message-ID: <1504745502.859cfb6823a2ad2eb2a3d3132553b28273c2f32a.robbat2@gentoo> Subject: [gentoo-commits] proj/genkernel:master commit in: defaults/ X-VCS-Repository: proj/genkernel X-VCS-Files: defaults/kernel-generic-config X-VCS-Directories: defaults/ X-VCS-Committer: robbat2 X-VCS-Committer-Name: Robin H. Johnson X-VCS-Revision: 859cfb6823a2ad2eb2a3d3132553b28273c2f32a X-VCS-Branch: master Date: Thu, 7 Sep 2017 00:52:57 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: d8f8b4c8-7964-4718-b3fc-50eb54244a2e X-Archives-Hash: 9f2ed9caa5ca4c18f3fc0ba966036faa commit: 859cfb6823a2ad2eb2a3d3132553b28273c2f32a Author: Robin H. Johnson gentoo org> AuthorDate: Thu Sep 7 00:51:42 2017 +0000 Commit: Robin H. Johnson gentoo org> CommitDate: Thu Sep 7 00:51:42 2017 +0000 URL: https://gitweb.gentoo.org/proj/genkernel.git/commit/?id=859cfb68 defaults/kernel-generic-config: CONFIG_FB_RADEON conflicts with CONFIG_DRM_RADEON. Fixes: https://bugs.gentoo.org/show_bug.cgi?id=575400 Signed-off-by: Robin H. Johnson gentoo.org> defaults/kernel-generic-config | 4 ---- 1 file changed, 4 deletions(-) diff --git a/defaults/kernel-generic-config b/defaults/kernel-generic-config index cd5508f..369c6d1 100644 --- a/defaults/kernel-generic-config +++ b/defaults/kernel-generic-config @@ -2780,9 +2780,6 @@ CONFIG_FB_MATROX_MULTIHEAD=y # CONFIG_FB_PM2 is not set # CONFIG_FB_PM2_FIFO_DISCONNECT is not set # CONFIG_FB_PM3 is not set -CONFIG_FB_RADEON=m -# CONFIG_FB_RADEON_DEBUG is not set -CONFIG_FB_RADEON_I2C=y CONFIG_FB_RIVA=m # CONFIG_FB_RIVA_DEBUG is not set # CONFIG_FB_RIVA_I2C is not set @@ -3811,7 +3808,6 @@ CONFIG_BACKLIGHT_CLASS_DEVICE=m CONFIG_BACKLIGHT_PROGEAR=m CONFIG_FB_NVIDIA_BACKLIGHT=y CONFIG_FB_RIVA_BACKLIGHT=y -CONFIG_FB_RADEON_BACKLIGHT=y CONFIG_FB_ATY128_BACKLIGHT=y CONFIG_FB_ATY_BACKLIGHT=y # CONFIG_BACKLIGHT_SAHARA is not set