diff options
| author | Stephen Rothwell <sfr@canb.auug.org.au> | 2014-12-12 13:25:16 +1100 |
|---|---|---|
| committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2014-12-12 13:25:16 +1100 |
| commit | 171c69846b9c9c30081e3165c474c6b42d8e3726 (patch) | |
| tree | acbe54e255538beca8c1258bc5de1fe5d3ba4c46 /drivers/usb/host/fusbh200-hcd.c | |
| parent | 3f43b18abbc10c6127922bd34f3f768c379a0a68 (diff) | |
| parent | 078014dd36989c66378dfe80066c3f8a1f6952e8 (diff) | |
Merge remote-tracking branch 'trivial/for-next'
Conflicts:
drivers/pci/pci-driver.c
Diffstat (limited to 'drivers/usb/host/fusbh200-hcd.c')
| -rw-r--r-- | drivers/usb/host/fusbh200-hcd.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/usb/host/fusbh200-hcd.c b/drivers/usb/host/fusbh200-hcd.c index abe42f31559f..664d2aa1239c 100644 --- a/drivers/usb/host/fusbh200-hcd.c +++ b/drivers/usb/host/fusbh200-hcd.c @@ -4893,7 +4893,7 @@ static ssize_t store_uframe_periodic_max(struct device *dev, if (allocated_max > uframe_periodic_max) { fusbh200_info(fusbh200, - "cannot decrease uframe_periodic_max becase " + "cannot decrease uframe_periodic_max because " "periodic bandwidth is already allocated " "(%u > %u)\n", allocated_max, uframe_periodic_max); |