From patchwork Mon Sep 6 14:36:25 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Christian Dietrich X-Patchwork-Id: 63925 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 3911AB73F6 for ; Tue, 7 Sep 2010 00:38:09 +1000 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753985Ab0IFOgb (ORCPT ); Mon, 6 Sep 2010 10:36:31 -0400 Received: from faui40.informatik.uni-erlangen.de ([131.188.34.40]:33562 "EHLO faui40.informatik.uni-erlangen.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753927Ab0IFOg1 (ORCPT ); Mon, 6 Sep 2010 10:36:27 -0400 Received: from faui49q (faui49q.informatik.uni-erlangen.de [131.188.42.68]) by faui40.informatik.uni-erlangen.de (Postfix) with SMTP id 3B61E5F296; Mon, 6 Sep 2010 16:36:25 +0200 (MEST) Received: by faui49q (sSMTP sendmail emulation); Mon, 06 Sep 2010 16:36:25 +0200 Date: Mon, 6 Sep 2010 16:36:25 +0200 From: Christian Dietrich To: "David S. Miller" , Roland Dreier , Alexey Dobriyan , Joe Perches , netdev@vger.kernel.org, linux-kernel@vger.kernel.org Cc: vamos-dev@i4.informatik.uni-erlangen.de Subject: [PATCH 06/14] drivers/net: Removing undead ifdef CHELSIO_T1_1G Message-ID: References: MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: User-Agent: Mutt/1.5.20 (2009-06-14) Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org The CHELSIO_T1_1G ifdef isn't necessary at this point, because it is checked in an outer ifdef level already and has no effect here. Signed-off-by: Christian Dietrich --- drivers/net/chelsio/subr.c | 2 -- 1 files changed, 0 insertions(+), 2 deletions(-) diff --git a/drivers/net/chelsio/subr.c b/drivers/net/chelsio/subr.c index 599d178..63ebf76 100644 --- a/drivers/net/chelsio/subr.c +++ b/drivers/net/chelsio/subr.c @@ -314,14 +314,12 @@ static int mi1_mdio_write(struct net_device *dev, int phy_addr, int mmd_addr, return 0; } -#if defined(CONFIG_CHELSIO_T1_1G) static const struct mdio_ops mi1_mdio_ops = { .init = mi1_mdio_init, .read = mi1_mdio_read, .write = mi1_mdio_write, .mode_support = MDIO_SUPPORTS_C22 }; -#endif #endif