From patchwork Wed Sep 14 13:57:12 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Dave Martin X-Patchwork-Id: 4071 Return-Path: X-Original-To: patchwork@peony.canonical.com Delivered-To: patchwork@peony.canonical.com Received: from fiordland.canonical.com (fiordland.canonical.com [91.189.94.145]) by peony.canonical.com (Postfix) with ESMTP id E21E023EF5 for ; Wed, 14 Sep 2011 13:57:41 +0000 (UTC) Received: from mail-fx0-f52.google.com (mail-fx0-f52.google.com [209.85.161.52]) by fiordland.canonical.com (Postfix) with ESMTP id D73EBA18877 for ; Wed, 14 Sep 2011 13:57:41 +0000 (UTC) Received: by mail-fx0-f52.google.com with SMTP id 23so2339219fxe.11 for ; Wed, 14 Sep 2011 06:57:41 -0700 (PDT) Received: by 10.223.33.19 with SMTP id f19mr1405205fad.122.1316008661738; Wed, 14 Sep 2011 06:57:41 -0700 (PDT) X-Forwarded-To: linaro-patchwork@canonical.com X-Forwarded-For: patch@linaro.org linaro-patchwork@canonical.com Delivered-To: patches@linaro.org Received: by 10.152.11.8 with SMTP id m8cs51606lab; Wed, 14 Sep 2011 06:57:41 -0700 (PDT) Received: by 10.227.204.14 with SMTP id fk14mr27632wbb.88.1316008660994; Wed, 14 Sep 2011 06:57:40 -0700 (PDT) Received: from mail-wy0-f178.google.com (mail-wy0-f178.google.com [74.125.82.178]) by mx.google.com with ESMTPS id fe9si3707656wbb.62.2011.09.14.06.57.40 (version=TLSv1/SSLv3 cipher=OTHER); Wed, 14 Sep 2011 06:57:40 -0700 (PDT) Received-SPF: neutral (google.com: 74.125.82.178 is neither permitted nor denied by best guess record for domain of dave.martin@linaro.org) client-ip=74.125.82.178; Authentication-Results: mx.google.com; spf=neutral (google.com: 74.125.82.178 is neither permitted nor denied by best guess record for domain of dave.martin@linaro.org) smtp.mail=dave.martin@linaro.org Received: by mail-wy0-f178.google.com with SMTP id 23so1741687wyf.37 for ; Wed, 14 Sep 2011 06:57:40 -0700 (PDT) Received: by 10.227.134.145 with SMTP id j17mr4273169wbt.79.1316008660052; Wed, 14 Sep 2011 06:57:40 -0700 (PDT) Received: from e103592.peterhouse.linaro.org (fw-lnat.cambridge.arm.com. [217.140.96.63]) by mx.google.com with ESMTPS id e2sm4162109wbh.19.2011.09.14.06.57.38 (version=SSLv3 cipher=OTHER); Wed, 14 Sep 2011 06:57:39 -0700 (PDT) From: Dave Martin To: linux-usb@vger.kernel.org Cc: patches@linaro.org, Grant Likely , Arvid Brodin , devicetree-discuss@lists.ozlabs.org, Dave Martin Subject: [PATCH 1/2] isp1760: Make probing via device tree non-powerpc-specific Date: Wed, 14 Sep 2011 14:57:12 +0100 Message-Id: <1316008633-31009-2-git-send-email-dave.martin@linaro.org> X-Mailer: git-send-email 1.7.4.1 In-Reply-To: <1316008633-31009-1-git-send-email-dave.martin@linaro.org> References: <1316008633-31009-1-git-send-email-dave.martin@linaro.org> This patch just replaces the (presumably historical) CONFIG_OF_PPC Signed-off-by: Dave Martin Acked-by: Pawel Moll --- drivers/usb/host/isp1760-if.c | 10 ++++++---- 1 files changed, 6 insertions(+), 4 deletions(-) diff --git a/drivers/usb/host/isp1760-if.c b/drivers/usb/host/isp1760-if.c index 7ee3005..69ee32c 100644 --- a/drivers/usb/host/isp1760-if.c +++ b/drivers/usb/host/isp1760-if.c @@ -17,16 +17,18 @@ #include "isp1760-hcd.h" -#ifdef CONFIG_PPC_OF +#ifdef CONFIG_OF #include #include +#include +#include #endif #ifdef CONFIG_PCI #include #endif -#ifdef CONFIG_PPC_OF +#ifdef CONFIG_OF static int of_isp1760_probe(struct platform_device *dev) { struct usb_hcd *hcd; @@ -396,7 +398,7 @@ static int __init isp1760_init(void) ret = platform_driver_register(&isp1760_plat_driver); if (!ret) any_ret = 0; -#ifdef CONFIG_PPC_OF +#ifdef CONFIG_OF ret = platform_driver_register(&isp1760_of_driver); if (!ret) any_ret = 0; @@ -416,7 +418,7 @@ module_init(isp1760_init); static void __exit isp1760_exit(void) { platform_driver_unregister(&isp1760_plat_driver); -#ifdef CONFIG_PPC_OF +#ifdef CONFIG_OF platform_driver_unregister(&isp1760_of_driver); #endif #ifdef CONFIG_PCI