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 /drivers/ata/pata_pdc2027x.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 'drivers/ata/pata_pdc2027x.c')
-rw-r--r-- | drivers/ata/pata_pdc2027x.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/ata/pata_pdc2027x.c b/drivers/ata/pata_pdc2027x.c index c9399c8688c5..3f94a886bb35 100644 --- a/drivers/ata/pata_pdc2027x.c +++ b/drivers/ata/pata_pdc2027x.c | |||
@@ -700,7 +700,8 @@ static void pdc_ata_setup_port(struct ata_ioports *port, void __iomem *base) | |||
700 | * @pdev: instance of pci_dev found | 700 | * @pdev: instance of pci_dev found |
701 | * @ent: matching entry in the id_tbl[] | 701 | * @ent: matching entry in the id_tbl[] |
702 | */ | 702 | */ |
703 | static int __devinit pdc2027x_init_one(struct pci_dev *pdev, const struct pci_device_id *ent) | 703 | static int pdc2027x_init_one(struct pci_dev *pdev, |
704 | const struct pci_device_id *ent) | ||
704 | { | 705 | { |
705 | static const unsigned long cmd_offset[] = { 0x17c0, 0x15c0 }; | 706 | static const unsigned long cmd_offset[] = { 0x17c0, 0x15c0 }; |
706 | static const unsigned long bmdma_offset[] = { 0x1000, 0x1008 }; | 707 | static const unsigned long bmdma_offset[] = { 0x1000, 0x1008 }; |