{"id":981,"url":"http://patchwork.ozlabs.org/api/1.0/patches/981/?format=json","project":{"id":7,"url":"http://patchwork.ozlabs.org/api/1.0/projects/7/?format=json","name":"Linux network development","link_name":"netdev","list_id":"netdev.vger.kernel.org","list_email":"netdev@vger.kernel.org","web_url":null,"scm_url":null,"webscm_url":null},"msgid":"<200809222152.m8MLqJsW031972@imap1.linux-foundation.org>","date":"2008-09-22T21:52:19","name":"[12/21] netdev: drop CONFIG_PPC_MERGE from Kconfig","commit_ref":null,"pull_url":null,"state":"accepted","archived":true,"hash":"4eefea530b52ad3673c5abe63459807db9fd0b5c","submitter":{"id":107,"url":"http://patchwork.ozlabs.org/api/1.0/people/107/?format=json","name":"Andrew Morton","email":"akpm@linux-foundation.org"},"delegate":{"id":36,"url":"http://patchwork.ozlabs.org/api/1.0/users/36/?format=json","username":"jgarzik","first_name":"Jeff","last_name":"Garzik","email":"jgarzik@pobox.com"},"mbox":"http://patchwork.ozlabs.org/project/netdev/patch/200809222152.m8MLqJsW031972@imap1.linux-foundation.org/mbox/","series":[],"check":"pending","checks":"http://patchwork.ozlabs.org/api/patches/981/checks/","tags":{},"headers":{"Return-Path":"","X-Original-To":"patchwork-incoming@ozlabs.org","Delivered-To":"patchwork-incoming@ozlabs.org","Received":["from vger.kernel.org (vger.kernel.org [209.132.176.167])\n\tby ozlabs.org (Postfix) with ESMTP id 96940DDE24\n\tfor ;\n\tTue, 23 Sep 2008 08:00:12 +1000 (EST)","(majordomo@vger.kernel.org) by vger.kernel.org via listexpand\n\tid S1754109AbYIVV7b (ORCPT );\n\tMon, 22 Sep 2008 17:59:31 -0400","(majordomo@vger.kernel.org) by vger.kernel.org id S1754632AbYIVV7a\n\t(ORCPT ); Mon, 22 Sep 2008 17:59:30 -0400","from smtp1.linux-foundation.org ([140.211.169.13]:57975 \"EHLO\n\tsmtp1.linux-foundation.org\" rhost-flags-OK-OK-OK-OK)\n\tby vger.kernel.org with ESMTP id S1754215AbYIVV7L (ORCPT\n\t); Mon, 22 Sep 2008 17:59:11 -0400","from imap1.linux-foundation.org (imap1.linux-foundation.org\n\t[140.211.169.55])\n\tby smtp1.linux-foundation.org (8.14.2/8.13.5/Debian-3ubuntu1.1) with\n\tESMTP id m8MLrDOP018507\n\t(version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=NO);\n\tMon, 22 Sep 2008 14:57:40 -0700","from localhost.localdomain (localhost [127.0.0.1])\n\tby imap1.linux-foundation.org\n\t(8.13.5.20060308/8.13.5/Debian-3ubuntu1.1) with ESMTP id\n\tm8MLqJsW031972; Mon, 22 Sep 2008 14:52:19 -0700"],"Message-Id":"<200809222152.m8MLqJsW031972@imap1.linux-foundation.org>","Subject":"[patch 12/21] netdev: drop CONFIG_PPC_MERGE from Kconfig","To":"jeff@garzik.org","Cc":"netdev@vger.kernel.org, akpm@linux-foundation.org,\n\tgalak@kernel.crashing.org, benh@kernel.crashing.org,\n\tdavid@gibson.dropbear.id.au, jwboyer@linux.vnet.ibm.com, paulus@samba.org","From":"akpm@linux-foundation.org","Date":"Mon, 22 Sep 2008 14:52:19 -0700","X-Spam-Status":"No, hits=-3.359 required=5 tests=AWL, BAYES_00,\n\tOSDL_HEADER_SUBJECT_BRACKETED","X-Spam-Checker-Version":"SpamAssassin 3.2.4-osdl_revision__1.47__","X-MIMEDefang-Filter":"lf$Revision: 1.188 $","X-Scanned-By":"MIMEDefang 2.63 on 140.211.169.13","Sender":"netdev-owner@vger.kernel.org","Precedence":"bulk","List-ID":"","X-Mailing-List":"netdev@vger.kernel.org"},"content":"From: Kumar Gala \n\nNow that arch/ppc is dead CONFIG_PPC_MERGE is always defined for all\npowerpc platforms so we don't need to depend on it.\n\nSigned-off-by: Kumar Gala \nCc: Benjamin Herrenschmidt \nCc: Paul Mackerras \nCc: Josh Boyer \nCc: David Gibson \nCc: Jeff Garzik \nSigned-off-by: Andrew Morton \n---\n\n drivers/net/Kconfig | 2 +-\n drivers/net/ibm_newemac/Kconfig | 2 +-\n 2 files changed, 2 insertions(+), 2 deletions(-)","diff":"diff -puN drivers/net/Kconfig~netdev-drop-config_ppc_merge-from-kconfig drivers/net/Kconfig\n--- a/drivers/net/Kconfig~netdev-drop-config_ppc_merge-from-kconfig\n+++ a/drivers/net/Kconfig\n@@ -1800,7 +1800,7 @@ config FEC2\n \n config FEC_MPC52xx\n \ttristate \"MPC52xx FEC driver\"\n-\tdepends on PPC_MERGE && PPC_MPC52xx && PPC_BESTCOMM_FEC\n+\tdepends on PPC_MPC52xx && PPC_BESTCOMM_FEC\n \tselect CRC32\n \tselect PHYLIB\n \t---help---\ndiff -puN drivers/net/ibm_newemac/Kconfig~netdev-drop-config_ppc_merge-from-kconfig drivers/net/ibm_newemac/Kconfig\n--- a/drivers/net/ibm_newemac/Kconfig~netdev-drop-config_ppc_merge-from-kconfig\n+++ a/drivers/net/ibm_newemac/Kconfig\n@@ -1,6 +1,6 @@\n config IBM_NEW_EMAC\n \ttristate \"IBM EMAC Ethernet support\"\n-\tdepends on PPC_DCR && PPC_MERGE\n+\tdepends on PPC_DCR\n \tselect CRC32\n \thelp\n \t This driver supports the IBM EMAC family of Ethernet controllers\n","prefixes":["12/21"]}