From patchwork Fri Apr 1 12:09:38 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Luke Yelavich X-Patchwork-Id: 89255 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from chlorine.canonical.com (chlorine.canonical.com [91.189.94.204]) by ozlabs.org (Postfix) with ESMTP id 627BBB6F8C for ; Fri, 1 Apr 2011 23:11:19 +1100 (EST) Received: from localhost ([127.0.0.1] helo=chlorine.canonical.com) by chlorine.canonical.com with esmtp (Exim 4.71) (envelope-from ) id 1Q5dC6-0002eX-U5; Fri, 01 Apr 2011 12:11:14 +0000 Received: from nskntmtas04p.mx.bigpond.com ([61.9.168.146]) by chlorine.canonical.com with esmtp (Exim 4.71) (envelope-from ) id 1Q5dC4-0002bP-CA for kernel-team@lists.ubuntu.com; Fri, 01 Apr 2011 12:11:12 +0000 Received: from nskntotgx03p.mx.bigpond.com ([58.160.38.86]) by nskntmtas04p.mx.bigpond.com with ESMTP id <20110401121107.EHLF1385.nskntmtas04p.mx.bigpond.com@nskntotgx03p.mx.bigpond.com>; Fri, 1 Apr 2011 12:11:07 +0000 Received: from strigy.yelavich.home ([58.160.38.86]) by nskntotgx03p.mx.bigpond.com with ESMTP id <20110401121107.ZEIW9786.nskntotgx03p.mx.bigpond.com@strigy.yelavich.home>; Fri, 1 Apr 2011 12:11:07 +0000 From: Luke Yelavich To: kernel-team@lists.ubuntu.com Subject: [PATCH 3/3] UBUNTU: [Config] Build some framebuffer drivers as modules for powerpc kernels. Date: Fri, 1 Apr 2011 23:09:38 +1100 Message-Id: <1301659778-14070-4-git-send-email-themuso@ubuntu.com> X-Mailer: git-send-email 1.7.4.1 In-Reply-To: <1301659778-14070-1-git-send-email-themuso@ubuntu.com> References: <1301659778-14070-1-git-send-email-themuso@ubuntu.com> X-SIH-MSG-ID: qRkzGdP6TAD0zmZ50TCxOw4nyF2wq3gv8ZoaRdJiqQQbRFjLv9GoAZOzAuMD0Z7nxD9OPBuENGEnc67kXI7r X-BeenThere: kernel-team@lists.ubuntu.com X-Mailman-Version: 2.1.13 Precedence: list List-Id: Kernel team discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: kernel-team-bounces@lists.ubuntu.com Errors-To: kernel-team-bounces@lists.ubuntu.com At some point in the past with config update/consolidation, some framebuffer drivers got built into the powerpc kernels. This config change builds these drivers as modules, as the OpenFirmware framebuffer driver is already in the kernel. This also allows DRM modules to take priority in the case of radeon cards. Signed-off-by: Luke Yelavich --- debian.master/config/powerpc/config.common.powerpc | 4 ---- .../config/powerpc/config.flavour.powerpc | 4 ++++ .../config/powerpc/config.flavour.powerpc-smp | 4 ++++ .../config/powerpc/config.flavour.powerpc64-smp | 4 ++++ 4 files changed, 12 insertions(+), 4 deletions(-) diff --git a/debian.master/config/powerpc/config.common.powerpc b/debian.master/config/powerpc/config.common.powerpc index a3723f9..4d341ee 100644 --- a/debian.master/config/powerpc/config.common.powerpc +++ b/debian.master/config/powerpc/config.common.powerpc @@ -71,14 +71,10 @@ CONFIG_DVB_USB_DIBUSB_MB_FAULTY=y # CONFIG_ET131X is not set # CONFIG_EZX_PCAP is not set CONFIG_FB_3DFX=y -CONFIG_FB_ATY=y -CONFIG_FB_ATY128=y CONFIG_FB_BACKLIGHT=y # CONFIG_FB_BOOT_VESA_SUPPORT is not set CONFIG_FB_DDC=y CONFIG_FB_MACMODES=y -CONFIG_FB_MATROX=y -CONFIG_FB_RADEON=y CONFIG_FB_S1D13XXX=m CONFIG_FB_SAVAGE=m CONFIG_FB_SVGALIB=m diff --git a/debian.master/config/powerpc/config.flavour.powerpc b/debian.master/config/powerpc/config.flavour.powerpc index 69a821c..01a6ba9 100644 --- a/debian.master/config/powerpc/config.flavour.powerpc +++ b/debian.master/config/powerpc/config.flavour.powerpc @@ -8,6 +8,10 @@ # CONFIG_CFG80211_REG_DEBUG is not set # CONFIG_CRASH_DUMP is not set CONFIG_CRYPTO_LZO=m +CONFIG_FB_ATY=y +CONFIG_FB_ATY128=m +CONFIG_FB_MATROX=m +CONFIG_FB_RADEON=m CONFIG_FB_SYS_COPYAREA=m CONFIG_FB_SYS_FILLRECT=m CONFIG_FB_SYS_FOPS=m diff --git a/debian.master/config/powerpc/config.flavour.powerpc-smp b/debian.master/config/powerpc/config.flavour.powerpc-smp index f84bc80..b7e4153 100644 --- a/debian.master/config/powerpc/config.flavour.powerpc-smp +++ b/debian.master/config/powerpc/config.flavour.powerpc-smp @@ -8,6 +8,10 @@ CONFIG_CFG80211_REG_DEBUG=y # CONFIG_CRASH_DUMP is not set CONFIG_CRYPTO_LZO=m +CONFIG_FB_ATY=m +CONFIG_FB_ATY128=m +CONFIG_FB_MATROX=m +CONFIG_FB_RADEON=m CONFIG_FB_SYS_COPYAREA=m CONFIG_FB_SYS_FILLRECT=m CONFIG_FB_SYS_FOPS=m diff --git a/debian.master/config/powerpc/config.flavour.powerpc64-smp b/debian.master/config/powerpc/config.flavour.powerpc64-smp index 89d3151..d053865 100644 --- a/debian.master/config/powerpc/config.flavour.powerpc64-smp +++ b/debian.master/config/powerpc/config.flavour.powerpc64-smp @@ -8,6 +8,10 @@ CONFIG_ATA_NONSTANDARD=y # CONFIG_CFG80211_REG_DEBUG is not set CONFIG_CRASH_DUMP=y CONFIG_CRYPTO_LZO=y +CONFIG_FB_ATY=m +CONFIG_FB_ATY128=m +CONFIG_FB_MATROX=m +CONFIG_FB_RADEON=m CONFIG_FB_SYS_COPYAREA=y CONFIG_FB_SYS_FILLRECT=y CONFIG_FB_SYS_FOPS=y