From patchwork Tue Mar 12 00:21:50 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Paul Bolle X-Patchwork-Id: 226726 X-Patchwork-Delegate: michael@ellerman.id.au Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Received: from ozlabs.org (localhost [IPv6:::1]) by ozlabs.org (Postfix) with ESMTP id B7E0E2C0404 for ; Tue, 12 Mar 2013 11:22:24 +1100 (EST) Received: from cpsmtpb-ews04.kpnxchange.com (cpsmtpb-ews04.kpnxchange.com [213.75.39.7]) by ozlabs.org (Postfix) with ESMTP id 99C242C02A2 for ; Tue, 12 Mar 2013 11:21:55 +1100 (EST) Received: from cpsps-ews12.kpnxchange.com ([10.94.84.179]) by cpsmtpb-ews04.kpnxchange.com with Microsoft SMTPSVC(7.5.7601.17514); Tue, 12 Mar 2013 01:20:23 +0100 Received: from CPSMTPM-TLF103.kpnxchange.com ([195.121.3.6]) by cpsps-ews12.kpnxchange.com with Microsoft SMTPSVC(7.5.7601.17514); Tue, 12 Mar 2013 01:20:23 +0100 Received: from [192.168.1.101] ([212.123.139.93]) by CPSMTPM-TLF103.kpnxchange.com with Microsoft SMTPSVC(7.5.7601.17514); Tue, 12 Mar 2013 01:21:51 +0100 Message-ID: <1363047710.3137.132.camel@x61.thuisdomein> Subject: [PATCH] powerpc: remove outdated default From: Paul Bolle To: Benjamin Herrenschmidt , Paul Mackerras Date: Tue, 12 Mar 2013 01:21:50 +0100 X-Mailer: Evolution 3.4.4 (3.4.4-2.fc17) Mime-Version: 1.0 X-OriginalArrivalTime: 12 Mar 2013 00:21:51.0075 (UTC) FILETIME=[978CAB30:01CE1EB7] X-RcptDomain: lists.ozlabs.org Cc: linuxppc-dev@lists.ozlabs.org, linux-kernel@vger.kernel.org X-BeenThere: linuxppc-dev@lists.ozlabs.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: Linux on PowerPC Developers Mail List List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: linuxppc-dev-bounces+patchwork-incoming=ozlabs.org@lists.ozlabs.org Sender: "Linuxppc-dev" The Kconfig symbol PCI_PERMEDIA got removed in v2.6.24, through commit e6b6e3ffb9ee8926f9f2f7dc9147df73e27d5828 ("[POWERPC] Remove APUS support from arch/ppc"). Remove its last occurrence. Signed-off-by: Paul Bolle --- Tested with "make ARCH=powerpc menuconfig" using ps3_defconfig, both before and after this patch. ("!4xx && !CPM2 && !8xx" is true for ps3, and it uses PPC_PCI_CHOICE.) Nothing seemed to change. Which makes sense, as defaulting to an undefined symbol should be a nop. arch/powerpc/Kconfig | 1 - 1 file changed, 1 deletion(-) diff --git a/arch/powerpc/Kconfig b/arch/powerpc/Kconfig index b89d7eb..3d566c3 100644 --- a/arch/powerpc/Kconfig +++ b/arch/powerpc/Kconfig @@ -744,7 +744,6 @@ config PCI bool "PCI support" if PPC_PCI_CHOICE default y if !40x && !CPM2 && !8xx && !PPC_83xx \ && !PPC_85xx && !PPC_86xx && !GAMECUBE_COMMON - default PCI_PERMEDIA if !4xx && !CPM2 && !8xx default PCI_QSPAN if !4xx && !CPM2 && 8xx select ARCH_SUPPORTS_MSI select GENERIC_PCI_IOMAP