diff options
author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2013-01-21 11:37:57 -0800 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2013-01-21 11:37:57 -0800 |
commit | ad2e6329666650d9cafcae9ef53fbe09ea759ae2 (patch) | |
tree | b23eb258fa609be246bb44cd9b33ff86d8142ca7 /drivers/char/hw_random/bcm63xx-rng.c | |
parent | 1ee0a224bc9aad1de496c795f96bc6ba2c394811 (diff) | |
parent | b810075002c9f25a6da83cecda39d789000a04a9 (diff) | |
download | linux-3.10-ad2e6329666650d9cafcae9ef53fbe09ea759ae2.tar.gz linux-3.10-ad2e6329666650d9cafcae9ef53fbe09ea759ae2.tar.bz2 linux-3.10-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/char/hw_random/bcm63xx-rng.c')
-rw-r--r-- | drivers/char/hw_random/bcm63xx-rng.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/char/hw_random/bcm63xx-rng.c b/drivers/char/hw_random/bcm63xx-rng.c index ae95bcb18d4..f343b7d0dfa 100644 --- a/drivers/char/hw_random/bcm63xx-rng.c +++ b/drivers/char/hw_random/bcm63xx-rng.c @@ -61,7 +61,7 @@ static int bcm63xx_rng_data_read(struct hwrng *rng, u32 *data) return 4; } -static int __devinit bcm63xx_rng_probe(struct platform_device *pdev) +static int bcm63xx_rng_probe(struct platform_device *pdev) { struct resource *r; struct clk *clk; @@ -161,7 +161,7 @@ static int bcm63xx_rng_remove(struct platform_device *pdev) static struct platform_driver bcm63xx_rng_driver = { .probe = bcm63xx_rng_probe, - .remove = __devexit_p(bcm63xx_rng_remove), + .remove = bcm63xx_rng_remove, .driver = { .name = "bcm63xx-rng", .owner = THIS_MODULE, |