From patchwork Mon Apr 18 11:04:37 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mark Brown X-Patchwork-Id: 91714 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 E37DF1007D5 for ; Mon, 18 Apr 2011 21:04:39 +1000 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751340Ab1DRLEg (ORCPT ); Mon, 18 Apr 2011 07:04:36 -0400 Received: from opensource.wolfsonmicro.com ([80.75.67.52]:36520 "EHLO opensource2.wolfsonmicro.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1752422Ab1DRLEf (ORCPT ); Mon, 18 Apr 2011 07:04:35 -0400 Received: from finisterre.wolfsonmicro.main (unknown [87.246.78.26]) by opensource2.wolfsonmicro.com (Postfix) with ESMTPSA id B84D611013B; Mon, 18 Apr 2011 12:04:33 +0100 (BST) Received: from broonie by finisterre.wolfsonmicro.main with local (Exim 4.74) (envelope-from ) id 1QBmG4-0001c3-3p; Mon, 18 Apr 2011 12:04:44 +0100 From: Mark Brown To: "David S. Miller" , =?UTF-8?q?Micha=C5=82=20Miros=C5=82aw?= Cc: netdev@vger.kernel.org, patches@opensource.wolfsonmicro.com, Mark Brown Subject: [PATCH] net: dm9000: Fix build Date: Mon, 18 Apr 2011 12:04:37 +0100 Message-Id: <1303124677-6168-1-git-send-email-broonie@opensource.wolfsonmicro.com> X-Mailer: git-send-email 1.7.4.1 Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org Commit c88fcb (net: dm9000: convert to hw_features) broke the build of the dm9000 driver since it merged functions which use different names for the board info structure used for I/O operations without updating all the references to use the same name. Fix that. Signed-off-by: Mark Brown --- drivers/net/dm9000.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/drivers/net/dm9000.c b/drivers/net/dm9000.c index f7bdebb..fbaff35 100644 --- a/drivers/net/dm9000.c +++ b/drivers/net/dm9000.c @@ -768,7 +768,7 @@ dm9000_init_dm9000(struct net_device *dev) /* Checksum mode */ if (dev->hw_features & NETIF_F_RXCSUM) - iow(dm, DM9000_RCSR, + iow(db, DM9000_RCSR, (dev->features & NETIF_F_RXCSUM) ? RCSR_CSUM : 0); iow(db, DM9000_GPCR, GPCR_GEP_CNTL); /* Let GPIO0 output */