git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
USB: Fix usb/isp1760 build on sparc
[pandora-kernel.git]
/
drivers
/
usb
/
host
/
isp1760-if.c
diff --git
a/drivers/usb/host/isp1760-if.c
b/drivers/usb/host/isp1760-if.c
index
2c7fc83
..
2ac4ac2
100644
(file)
--- a/
drivers/usb/host/isp1760-if.c
+++ b/
drivers/usb/host/isp1760-if.c
@@
-11,13
+11,14
@@
#include <linux/usb.h>
#include <linux/io.h>
#include <linux/usb.h>
#include <linux/io.h>
+#include <linux/module.h>
#include <linux/platform_device.h>
#include <linux/usb/isp1760.h>
#include <linux/usb/hcd.h>
#include "isp1760-hcd.h"
#include <linux/platform_device.h>
#include <linux/usb/isp1760.h>
#include <linux/usb/hcd.h>
#include "isp1760-hcd.h"
-#if
def CONFIG_OF
+#if
defined(CONFIG_OF) && defined(CONFIG_OF_IRQ)
#include <linux/slab.h>
#include <linux/of.h>
#include <linux/of_platform.h>
#include <linux/slab.h>
#include <linux/of.h>
#include <linux/of_platform.h>
@@
-30,7
+31,7
@@
#include <linux/pci.h>
#endif
#include <linux/pci.h>
#endif
-#if
def CONFIG_OF
+#if
defined(CONFIG_OF) && defined(CONFIG_OF_IRQ)
struct isp1760 {
struct usb_hcd *hcd;
int rst_gpio;
struct isp1760 {
struct usb_hcd *hcd;
int rst_gpio;
@@
-436,7
+437,7
@@
static int __init isp1760_init(void)
ret = platform_driver_register(&isp1760_plat_driver);
if (!ret)
any_ret = 0;
ret = platform_driver_register(&isp1760_plat_driver);
if (!ret)
any_ret = 0;
-#if
def CONFIG_OF
+#if
defined(CONFIG_OF) && defined(CONFIG_OF_IRQ)
ret = platform_driver_register(&isp1760_of_driver);
if (!ret)
any_ret = 0;
ret = platform_driver_register(&isp1760_of_driver);
if (!ret)
any_ret = 0;
@@
-456,7
+457,7
@@
module_init(isp1760_init);
static void __exit isp1760_exit(void)
{
platform_driver_unregister(&isp1760_plat_driver);
static void __exit isp1760_exit(void)
{
platform_driver_unregister(&isp1760_plat_driver);
-#if
def CONFIG_OF
+#if
defined(CONFIG_OF) && defined(CONFIG_OF_IRQ)
platform_driver_unregister(&isp1760_of_driver);
#endif
#ifdef CONFIG_PCI
platform_driver_unregister(&isp1760_of_driver);
#endif
#ifdef CONFIG_PCI