diff options
author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2013-01-21 14:37:57 -0500 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2013-01-21 14:37:57 -0500 |
commit | ad2e6329666650d9cafcae9ef53fbe09ea759ae2 (patch) | |
tree | b23eb258fa609be246bb44cd9b33ff86d8142ca7 /arch/powerpc/platforms/chrp/pci.c | |
parent | 1ee0a224bc9aad1de496c795f96bc6ba2c394811 (diff) | |
parent | b810075002c9f25a6da83cecda39d789000a04a9 (diff) |
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.
Diffstat (limited to 'arch/powerpc/platforms/chrp/pci.c')
-rw-r--r-- | arch/powerpc/platforms/chrp/pci.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/powerpc/platforms/chrp/pci.c b/arch/powerpc/platforms/chrp/pci.c index 83285c5a2049..1b87e198faa7 100644 --- a/arch/powerpc/platforms/chrp/pci.c +++ b/arch/powerpc/platforms/chrp/pci.c | |||
@@ -323,7 +323,7 @@ chrp_find_bridges(void) | |||
323 | * ATA controller to be set to fully native mode or bad things | 323 | * ATA controller to be set to fully native mode or bad things |
324 | * will happen. | 324 | * will happen. |
325 | */ | 325 | */ |
326 | static void __devinit chrp_pci_fixup_winbond_ata(struct pci_dev *sl82c105) | 326 | static void chrp_pci_fixup_winbond_ata(struct pci_dev *sl82c105) |
327 | { | 327 | { |
328 | u8 progif; | 328 | u8 progif; |
329 | 329 | ||