diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2010-08-12 12:11:31 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2010-08-12 12:11:31 -0400 |
commit | 58d4ea65b98f154f3326b038eecda32f90b46ea8 (patch) | |
tree | 636aed413349dece12c08a4bd3d1fea0254976d8 /drivers/usb/gadget | |
parent | 26f0cf91813bdc8e61595f8ad6660251e2ee9cf6 (diff) | |
parent | fbe0f8348fd6c3d016a3f48756eb729b41a67c22 (diff) |
Merge branch 'next-devicetree' of git://git.secretlab.ca/git/linux-2.6
* 'next-devicetree' of git://git.secretlab.ca/git/linux-2.6:
mmc_spi: Fix unterminated of_match_table
of/sparc: fix build regression from of_device changes
of/device: Replace struct of_device with struct platform_device
Diffstat (limited to 'drivers/usb/gadget')
-rw-r--r-- | drivers/usb/gadget/fsl_qe_udc.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/drivers/usb/gadget/fsl_qe_udc.c b/drivers/usb/gadget/fsl_qe_udc.c index 9648b75f0283..a5ea2c1d8c93 100644 --- a/drivers/usb/gadget/fsl_qe_udc.c +++ b/drivers/usb/gadget/fsl_qe_udc.c | |||
@@ -2398,7 +2398,7 @@ int usb_gadget_unregister_driver(struct usb_gadget_driver *driver) | |||
2398 | EXPORT_SYMBOL(usb_gadget_unregister_driver); | 2398 | EXPORT_SYMBOL(usb_gadget_unregister_driver); |
2399 | 2399 | ||
2400 | /* udc structure's alloc and setup, include ep-param alloc */ | 2400 | /* udc structure's alloc and setup, include ep-param alloc */ |
2401 | static struct qe_udc __devinit *qe_udc_config(struct of_device *ofdev) | 2401 | static struct qe_udc __devinit *qe_udc_config(struct platform_device *ofdev) |
2402 | { | 2402 | { |
2403 | struct qe_udc *udc; | 2403 | struct qe_udc *udc; |
2404 | struct device_node *np = ofdev->dev.of_node; | 2404 | struct device_node *np = ofdev->dev.of_node; |
@@ -2523,7 +2523,7 @@ static void qe_udc_release(struct device *dev) | |||
2523 | } | 2523 | } |
2524 | 2524 | ||
2525 | /* Driver probe functions */ | 2525 | /* Driver probe functions */ |
2526 | static int __devinit qe_udc_probe(struct of_device *ofdev, | 2526 | static int __devinit qe_udc_probe(struct platform_device *ofdev, |
2527 | const struct of_device_id *match) | 2527 | const struct of_device_id *match) |
2528 | { | 2528 | { |
2529 | struct device_node *np = ofdev->dev.of_node; | 2529 | struct device_node *np = ofdev->dev.of_node; |
@@ -2679,18 +2679,18 @@ err1: | |||
2679 | } | 2679 | } |
2680 | 2680 | ||
2681 | #ifdef CONFIG_PM | 2681 | #ifdef CONFIG_PM |
2682 | static int qe_udc_suspend(struct of_device *dev, pm_message_t state) | 2682 | static int qe_udc_suspend(struct platform_device *dev, pm_message_t state) |
2683 | { | 2683 | { |
2684 | return -ENOTSUPP; | 2684 | return -ENOTSUPP; |
2685 | } | 2685 | } |
2686 | 2686 | ||
2687 | static int qe_udc_resume(struct of_device *dev) | 2687 | static int qe_udc_resume(struct platform_device *dev) |
2688 | { | 2688 | { |
2689 | return -ENOTSUPP; | 2689 | return -ENOTSUPP; |
2690 | } | 2690 | } |
2691 | #endif | 2691 | #endif |
2692 | 2692 | ||
2693 | static int __devexit qe_udc_remove(struct of_device *ofdev) | 2693 | static int __devexit qe_udc_remove(struct platform_device *ofdev) |
2694 | { | 2694 | { |
2695 | struct qe_ep *ep; | 2695 | struct qe_ep *ep; |
2696 | unsigned int size; | 2696 | unsigned int size; |