diff options
| author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2013-01-21 20:37:57 +0100 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2013-01-21 20:37:57 +0100 |
| commit | ad2e6329666650d9cafcae9ef53fbe09ea759ae2 (patch) | |
| tree | b23eb258fa609be246bb44cd9b33ff86d8142ca7 /drivers/ata/pata_imx.c | |
| parent | USB: io_ti: Fix NULL dereference in chase_port() (diff) | |
| parent | usb: gadget: FunctionFS: Fix missing braces in parse_opts (diff) | |
| download | linux-ad2e6329666650d9cafcae9ef53fbe09ea759ae2.tar.xz linux-ad2e6329666650d9cafcae9ef53fbe09ea759ae2.zip | |
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_imx.c')
| -rw-r--r-- | drivers/ata/pata_imx.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/ata/pata_imx.c b/drivers/ata/pata_imx.c index 7d40b526ef11..40849445a9dc 100644 --- a/drivers/ata/pata_imx.c +++ b/drivers/ata/pata_imx.c @@ -91,7 +91,7 @@ static void pata_imx_setup_port(struct ata_ioports *ioaddr) ioaddr->command_addr = ioaddr->cmd_addr + (ATA_REG_CMD << 2); } -static int __devinit pata_imx_probe(struct platform_device *pdev) +static int pata_imx_probe(struct platform_device *pdev) { struct ata_host *host; struct ata_port *ap; @@ -167,7 +167,7 @@ free_priv: return -ENOMEM; } -static int __devexit pata_imx_remove(struct platform_device *pdev) +static int pata_imx_remove(struct platform_device *pdev) { struct ata_host *host = dev_get_drvdata(&pdev->dev); struct pata_imx_priv *priv = host->private_data; @@ -225,7 +225,7 @@ static const struct dev_pm_ops pata_imx_pm_ops = { static struct platform_driver pata_imx_driver = { .probe = pata_imx_probe, - .remove = __devexit_p(pata_imx_remove), + .remove = pata_imx_remove, .driver = { .name = DRV_NAME, .owner = THIS_MODULE, |