From patchwork Mon May 18 23:21:13 2009 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Gabriel Paubert X-Patchwork-Id: 27381 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming@bilbo.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from ozlabs.org (ozlabs.org [203.10.76.45]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (Client CN "mx.ozlabs.org", Issuer "CA Cert Signing Authority" (verified OK)) by bilbo.ozlabs.org (Postfix) with ESMTPS id 80D9EB707C for ; Tue, 19 May 2009 09:21:38 +1000 (EST) Received: by ozlabs.org (Postfix) id D230DDE1D2; Tue, 19 May 2009 09:21:36 +1000 (EST) Delivered-To: patchwork-incoming@ozlabs.org Received: from vger.kernel.org (vger.kernel.org [209.132.176.167]) by ozlabs.org (Postfix) with ESMTP id 69C89DE0DC for ; Tue, 19 May 2009 09:21:36 +1000 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752189AbZERXV3 (ORCPT ); Mon, 18 May 2009 19:21:29 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1752116AbZERXV2 (ORCPT ); Mon, 18 May 2009 19:21:28 -0400 Received: from gra-lx1.iram.es ([150.214.224.41]:51651 "EHLO gra-lx1.iram.es" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751951AbZERXV2 (ORCPT ); Mon, 18 May 2009 19:21:28 -0400 Received: from localhost (localhost [127.0.0.1]) by gra-lx1.iram.es (Postfix) with ESMTP id B6160184296; Tue, 19 May 2009 01:21:24 +0200 (CEST) X-Virus-Scanned: Debian amavisd-new at iram.es Received: from gra-lx1.iram.es ([127.0.0.1]) by localhost (gra-lx1.iram.es [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id PN5yZwzU7JZ2; Tue, 19 May 2009 01:21:14 +0200 (CEST) Received: from gra-vd1.iram.es (gra-vd1.iram.es [150.214.224.250]) by gra-lx1.iram.es (Postfix) with ESMTP id 95BFC1841BE; Tue, 19 May 2009 01:21:14 +0200 (CEST) Received: from gra-vd1.iram.es (localhost [127.0.0.1]) by gra-vd1.iram.es (8.14.3/8.14.3/Debian-5) with ESMTP id n4INLEJ7018531; Tue, 19 May 2009 01:21:14 +0200 Received: (from paubert@localhost) by gra-vd1.iram.es (8.14.3/8.13.8/Submit) id n4INLDns018530; Tue, 19 May 2009 01:21:13 +0200 Date: Tue, 19 May 2009 01:21:13 +0200 From: Gabriel Paubert To: Medve Emilian-EMMEDVE1 Cc: Lennert Buytenhek , tbm@cyrius.com, LinuxPPC , pacman@kosh.dhis.org, netdev@vger.kernel.org, David Miller Subject: [PATCH v2] Allow selecting mv643xx_eth on Pegasos again Message-ID: <20090518232113.GA18469@iram.es> References: <20090518173756.GA11805@iram.es> <598D5675D34BE349929AF5EDE9B03E2702C2D323@az33exm24.fsl.freescale.net> <20090518184752.GA12972@iram.es> <598D5675D34BE349929AF5EDE9B03E2702C2D3A5@az33exm24.fsl.freescale.net> <20090518221847.GA17348@iram.es> <598D5675D34BE349929AF5EDE9B03E2702C2D459@az33exm24.fsl.freescale.net> MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: <598D5675D34BE349929AF5EDE9B03E2702C2D459@az33exm24.fsl.freescale.net> User-Agent: Mutt/1.5.18 (2008-05-17) Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org Since PPC_MUTIPLATFORM was removed, it was impossible to select the driver for mv643xx_eth on the Pegasos. Fix it and take the opportunity to remove the stale MV64360 config option. Signed-off-by: Gabriel Paubert --- To unsubscribe from this list: send the line "unsubscribe netdev" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html diff --git a/drivers/net/Kconfig b/drivers/net/Kconfig index 214a92d..aff4f8c 100644 --- a/drivers/net/Kconfig +++ b/drivers/net/Kconfig @@ -2351,7 +2351,7 @@ config UGETH_TX_ON_DEMAND config MV643XX_ETH tristate "Marvell Discovery (643XX) and Orion ethernet support" - depends on MV64360 || MV64X60 || (PPC_MULTIPLATFORM && PPC32) || PLAT_ORION + depends on MV64X60 || PPC32 || PLAT_ORION select INET_LRO select PHYLIB help