From patchwork Mon Nov 7 21:47:53 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kjetil Oftedal X-Patchwork-Id: 124204 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 4E8851007D4 for ; Tue, 8 Nov 2011 09:12:55 +1100 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752648Ab1KGWMu (ORCPT ); Mon, 7 Nov 2011 17:12:50 -0500 Received: from mail47.e.nsc.no ([193.213.115.47]:49752 "EHLO mail47.e.nsc.no" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751067Ab1KGWMu (ORCPT ); Mon, 7 Nov 2011 17:12:50 -0500 X-Greylist: delayed 812 seconds by postgrey-1.27 at vger.kernel.org; Mon, 07 Nov 2011 17:12:49 EST Received: from 149.199.34.95.customer.cdi.no (149.199.34.95.customer.cdi.no [95.34.199.149]) by mail47.nsc.no (8.14.4/8.14.4) with ESMTP id pA7LxEPl018939 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=NOT); Mon, 7 Nov 2011 22:59:16 +0100 (MET) Date: Mon, 7 Nov 2011 22:47:53 +0100 (CET) From: Kjetil Oftedal X-X-Sender: kjetil@oizys.tordivel.org To: netdev@vger.kernel.org cc: sparclinux@vger.kernel.org Subject: [PATCH] sunhme: Allow usage on SBI based SBus systems Message-ID: MIME-Version: 1.0 Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org To prevent the SBus driver for Sun Happy Meal cards from being loaded for PCI cards utilizing the same chipset, a filter was added to the probe function in commit 0b492fce3d72d982a7981905f85484a1e1ba7fde. The filter was implemented by checking the name of the parent node in the OF tree. This patch extends this filter, so that the driver will load on SBus systems that are based upon SBI SBus Bridges. Signed-off-by: Kjetil Oftedal --- drivers/net/ethernet/sun/sunhme.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) -- 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/ethernet/sun/sunhme.c b/drivers/net/ethernet/sun/sunhme.c index c517dac..cf14ab9 100644 --- a/drivers/net/ethernet/sun/sunhme.c +++ b/drivers/net/ethernet/sun/sunhme.c @@ -2637,7 +2637,7 @@ static int __devinit happy_meal_sbus_probe_one(struct platform_device *op, int i sbus_dp = op->dev.parent->of_node; /* We can match PCI devices too, do not accept those here. */ - if (strcmp(sbus_dp->name, "sbus")) + if (strcmp(sbus_dp->name, "sbus") && strcmp(sbus_dp->name, "sbi")) return err; if (is_qfe) {