From ed43726ee665fd5efad851904ef200445e837b95 Mon Sep 17 00:00:00 2001
From: Joachim Foerster <joachim.foerster@missinglinkelectronics.com>
Date: Mon, 10 Oct 2011 18:06:54 +0200
Subject: [PATCH] --- yaml --- r: 265134 b: refs/heads/master c:
 8f5d621543cb064d2989fc223d3c2bc61a43981e h: refs/heads/master v: v3

---
 [refs]                              |  2 +-
 trunk/drivers/usb/host/isp1760-if.c | 10 ++++++----
 2 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/[refs] b/[refs]
index 25569d6865f3..e0e04f50847a 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 3687f641307eeff6f7fe31a88dc39db88e89238b
+refs/heads/master: 8f5d621543cb064d2989fc223d3c2bc61a43981e
diff --git a/trunk/drivers/usb/host/isp1760-if.c b/trunk/drivers/usb/host/isp1760-if.c
index d2f6b2dd7405..791792db6e12 100644
--- a/trunk/drivers/usb/host/isp1760-if.c
+++ b/trunk/drivers/usb/host/isp1760-if.c
@@ -17,16 +17,18 @@
 
 #include "isp1760-hcd.h"
 
-#ifdef CONFIG_PPC_OF
+#ifdef CONFIG_OF
 #include <linux/of.h>
 #include <linux/of_platform.h>
+#include <linux/of_address.h>
+#include <linux/of_irq.h>
 #endif
 
 #ifdef CONFIG_PCI
 #include <linux/pci.h>
 #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