Merge tag 'fixes-for-v3.8-rc5' of git://git.kernel.org/pub/scm/linux/kernel/git/balbi/usb into usb-linus

Felipe writes:

  usb: fixes for v3.8-rc5

  Finally we have a build fix for fsl-mxc-udc UDC driver.

  We also have a fix for ep0 maxburst setting on DWC3
  which could confuse the HW if we tell it we had way
  too many streams on that endpoint when it _has_ to be
  only one.

  cppi_dma support for MUSB got a fix when running as a
  module. By dropping the wrong __init annotation, the
  function will be available even when we're modules and
  we're done with .init.text section.

  Last, but not least, we have a fix on FunctionFS which
  was causing a bug on our option parsing algorithm.

1 files changed, 6 insertions, 6 deletions

diff --git a/include/linux/ata_platform.h b/include/linux/ata_platform.h
index fe9989636b62..b9fde17f767c 100644
--- a/include/linux/ata_platform.h
+++ b/include/linux/ata_platform.h
@@ -15,12 +15,12 @@ struct pata_platform_info {
         unsigned int irq_flags;
 };
 
-extern int __devinit __pata_platform_probe(struct device *dev,
-                                           struct resource *io_res,
-                                           struct resource *ctl_res,
-                                           struct resource *irq_res,
-                                           unsigned int ioport_shift,
-                                           int __pio_mask);
+extern int __pata_platform_probe(struct device *dev,
+                                 struct resource *io_res,
+                                 struct resource *ctl_res,
+                                 struct resource *irq_res,
+                                 unsigned int ioport_shift,
+                                 int __pio_mask);
 
 /*
  * Marvell SATA private data