From patchwork Wed Oct 2 15:08:03 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: tedheadster X-Patchwork-Id: 279790 X-Patchwork-Delegate: davem@davemloft.net 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.180.67]) by ozlabs.org (Postfix) with ESMTP id A9FEF2C0079 for ; Thu, 3 Oct 2013 01:08:21 +1000 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753526Ab3JBPIM (ORCPT ); Wed, 2 Oct 2013 11:08:12 -0400 Received: from mail-qa0-f41.google.com ([209.85.216.41]:55126 "EHLO mail-qa0-f41.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753046Ab3JBPIK (ORCPT ); Wed, 2 Oct 2013 11:08:10 -0400 Received: by mail-qa0-f41.google.com with SMTP id ii20so4451769qab.14 for ; Wed, 02 Oct 2013 08:08:09 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:subject:date:message-id; bh=DqFiOKOE9IyaE8Zb21ftFhRQtrZplz28kz45cZfC1ng=; b=U0+Xq8xoF2vn+WKY9OdwSX4ui7dx/+zwBJs5cXWGEcRRHNzee85QPJMw1uQYyWtIKS GgZhv+m/1NdfkvTGSU5tZheUxjLIfHuAqzLcj9zaUSpN+Ldmkrbur9PNHvFs+u7crCoT gP7TQ5vpNvOwFgOGjLcB/PzpF9y0I8QBqgluPBiQeguX4xtqknpNVbr6CL+gRQkuZlrh 51YfgYoTLXlhSoPuYZ3tTFR+Ti/ZMcl9nfhyzkpddrzwISnqXIS/v8UEGBNCcoKaaHh6 1peZzSUdhtaswpEmjKzLIubVQGwo8HC9fmV1IwUfeU6KWrgR78vCJwos7aqRmMdqhrzO /XbA== X-Received: by 10.224.61.198 with SMTP id u6mr4074646qah.83.1380726489926; Wed, 02 Oct 2013 08:08:09 -0700 (PDT) Received: from localhost.localdomain (pool-72-81-142-116.bltmmd.fios.verizon.net. [72.81.142.116]) by mx.google.com with ESMTPSA id 4sm3178874qak.11.1969.12.31.16.00.00 (version=TLSv1 cipher=RC4-SHA bits=128/128); Wed, 02 Oct 2013 08:08:09 -0700 (PDT) From: Matthew Whitehead To: netdev@vger.kernel.org Cc: Matthew Whitehead Subject: [PATCH net-next] 3com: Fix drivers/net/ethernet/3com/Kconfig references to PCMCIA and 3c515 Date: Wed, 2 Oct 2013 11:08:03 -0400 Message-Id: <1380726483-17247-1-git-send-email-tedheadster@gmail.com> X-Mailer: git-send-email 1.7.2.5 Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org The Vortex driver works with PCI and Cardbus devices, not PCMCIA. There never was an EISA 3c515 card, only ISA, so remove that option. Signed-off-by: Matthew Whitehead --- drivers/net/ethernet/3com/Kconfig | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/net/ethernet/3com/Kconfig b/drivers/net/ethernet/3com/Kconfig index f00c763..65b735d 100644 --- a/drivers/net/ethernet/3com/Kconfig +++ b/drivers/net/ethernet/3com/Kconfig @@ -35,7 +35,7 @@ config EL3 config 3C515 tristate "3c515 ISA \"Fast EtherLink\"" - depends on (ISA || EISA) && ISA_DMA_API + depends on ISA && ISA_DMA_API ---help--- If you have a 3Com ISA EtherLink XL "Corkscrew" 3c515 Fast Ethernet network card, say Y and read the Ethernet-HOWTO, available from @@ -70,7 +70,7 @@ config VORTEX select MII ---help--- This option enables driver support for a large number of 10Mbps and - 10/100Mbps EISA, PCI and PCMCIA 3Com network cards: + 10/100Mbps EISA, PCI and Cardbus 3Com network cards: "Vortex" (Fast EtherLink 3c590/3c592/3c595/3c597) EISA and PCI "Boomerang" (EtherLink XL 3c900 or 3c905) PCI