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/isp1760: Let OF bindings depend on general CONFIG_OF instead of PPC_OF .
[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
7ee3005
..
791792d
100644
(file)
--- a/
drivers/usb/host/isp1760-if.c
+++ b/
drivers/usb/host/isp1760-if.c
@@
-17,16
+17,18
@@
#include "isp1760-hcd.h"
#include "isp1760-hcd.h"
-#ifdef CONFIG_
PPC_
OF
+#ifdef CONFIG_OF
#include <linux/of.h>
#include <linux/of_platform.h>
#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
#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;
static int of_isp1760_probe(struct platform_device *dev)
{
struct usb_hcd *hcd;
@@
-79,7
+81,7
@@
static int of_isp1760_probe(struct platform_device *dev)
devflags |= ISP1760_FLAG_DREQ_POL_HIGH;
hcd = isp1760_register(memory.start, res_len, virq,
devflags |= ISP1760_FLAG_DREQ_POL_HIGH;
hcd = isp1760_register(memory.start, res_len, virq,
- IRQF_SHARED
| IRQF_DISABLED
, &dev->dev, dev_name(&dev->dev),
+ IRQF_SHARED, &dev->dev, dev_name(&dev->dev),
devflags);
if (IS_ERR(hcd)) {
ret = PTR_ERR(hcd);
devflags);
if (IS_ERR(hcd)) {
ret = PTR_ERR(hcd);
@@
-240,7
+242,7
@@
static int __devinit isp1761_pci_probe(struct pci_dev *dev,
dev->dev.dma_mask = NULL;
hcd = isp1760_register(pci_mem_phy0, memlength, dev->irq,
dev->dev.dma_mask = NULL;
hcd = isp1760_register(pci_mem_phy0, memlength, dev->irq,
- IRQF_SHARED
| IRQF_DISABLED
, &dev->dev, dev_name(&dev->dev),
+ IRQF_SHARED, &dev->dev, dev_name(&dev->dev),
devflags);
if (IS_ERR(hcd)) {
ret_status = -ENODEV;
devflags);
if (IS_ERR(hcd)) {
ret_status = -ENODEV;
@@
-313,7
+315,7
@@
static int __devinit isp1760_plat_probe(struct platform_device *pdev)
resource_size_t mem_size;
struct isp1760_platform_data *priv = pdev->dev.platform_data;
unsigned int devflags = 0;
resource_size_t mem_size;
struct isp1760_platform_data *priv = pdev->dev.platform_data;
unsigned int devflags = 0;
- unsigned long irqflags = IRQF_SHARED
| IRQF_DISABLED
;
+ unsigned long irqflags = IRQF_SHARED;
mem_res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
if (!mem_res) {
mem_res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
if (!mem_res) {
@@
-396,7
+398,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;
-#ifdef CONFIG_
PPC_
OF
+#ifdef CONFIG_OF
ret = platform_driver_register(&isp1760_of_driver);
if (!ret)
any_ret = 0;
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);
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
platform_driver_unregister(&isp1760_of_driver);
#endif
#ifdef CONFIG_PCI