From patchwork Tue Mar 13 21:15:49 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Leann Ogasawara X-Patchwork-Id: 146495 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 04668B6FA3 for ; Wed, 14 Mar 2012 08:16:11 +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 1S7Z4U-0005ET-Bn; Tue, 13 Mar 2012 21:15:54 +0000 Received: from youngberry.canonical.com ([91.189.89.112]) by chlorine.canonical.com with esmtp (Exim 4.71) (envelope-from ) id 1S7Z4S-0005DZ-Hi for kernel-team@lists.ubuntu.com; Tue, 13 Mar 2012 21:15:52 +0000 Received: from c-24-21-156-70.hsd1.or.comcast.net ([24.21.156.70] helo=adamo) by youngberry.canonical.com with esmtpsa (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1S7Z4S-0004fB-BX for kernel-team@lists.ubuntu.com; Tue, 13 Mar 2012 21:15:52 +0000 Received: by adamo (Postfix, from userid 1000) id C06FA20A56; Tue, 13 Mar 2012 14:15:49 -0700 (PDT) From: leann.ogasawara@canonical.com To: kernel-team@lists.ubuntu.com Subject: [Precise][PATCH 2/2] UBUNTU: [Config] Add CONFIG_DRM_PSB check to enforcer Date: Tue, 13 Mar 2012 14:15:49 -0700 Message-Id: X-Mailer: git-send-email 1.7.9 In-Reply-To: References: In-Reply-To: References: 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 From: Leann Ogasawara BugLink: http://bugs.launchpad.net/bugs/899244 Ensure CONFIG_STUB_POULSBO is disabled if CONFIG_DRM_PSB is enabled Signed-off-by: Leann Ogasawara --- debian.master/config/enforce | 6 ++++++ 1 files changed, 6 insertions(+), 0 deletions(-) diff --git a/debian.master/config/enforce b/debian.master/config/enforce index a268b83..f728597 100644 --- a/debian.master/config/enforce +++ b/debian.master/config/enforce @@ -103,3 +103,9 @@ value CONFIG_EFI_VARS y | !exists CONFIG_EFI_VARS # Ensure CONFIG_NVRAM is y for powerpc and powerpc-smp, LP:942193 (flavour powerpc powerpc-smp & value CONFIG_NVRAM y) | \ (value CONFIG_NVRAM m | !exists CONFIG_NVRAM) + +# Ensure CONFIG_STUB_POULSBO is disabled if CONFIG_DRM_PSB is enabled +# See LP:899244 +(!exists CONFIG_DRM_PSB | value CONFIG_DRM_PSB n) | \ +((value CONFIG_DRM_PSB y | value CONFIG_DRM_PSB m) & (value CONFIG_STUB_POULSBO n | !exists CONFIG_STUB_POULSBO)) +