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/pinctrl/pinctrl-tegra20.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/pinctrl/pinctrl-tegra20.c')
-rw-r--r-- | drivers/pinctrl/pinctrl-tegra20.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/pinctrl/pinctrl-tegra20.c b/drivers/pinctrl/pinctrl-tegra20.c index 1524bfd66602..e848189038f0 100644 --- a/drivers/pinctrl/pinctrl-tegra20.c +++ b/drivers/pinctrl/pinctrl-tegra20.c | |||
@@ -2856,7 +2856,7 @@ static const struct tegra_pinctrl_soc_data tegra20_pinctrl = { | |||
2856 | .ngroups = ARRAY_SIZE(tegra20_groups), | 2856 | .ngroups = ARRAY_SIZE(tegra20_groups), |
2857 | }; | 2857 | }; |
2858 | 2858 | ||
2859 | static int __devinit tegra20_pinctrl_probe(struct platform_device *pdev) | 2859 | static int tegra20_pinctrl_probe(struct platform_device *pdev) |
2860 | { | 2860 | { |
2861 | return tegra_pinctrl_probe(pdev, &tegra20_pinctrl); | 2861 | return tegra_pinctrl_probe(pdev, &tegra20_pinctrl); |
2862 | } | 2862 | } |