diff options
| author | Arnd Bergmann <[email protected]> | 2014-01-07 11:54:58 +0000 |
|---|---|---|
| committer | Greg Kroah-Hartman <[email protected]> | 2014-01-07 17:30:48 +0000 |
| commit | 1f53b485294509281cb918d6372ab24e82a1959e (patch) | |
| tree | f762e4261e29b512f3dd976b063b42858b25e9aa /drivers/usb/core/buffer.c | |
| parent | USB: oti6858: switch to generic TIOCMIWAIT implementation (diff) | |
| download | kernel-1f53b485294509281cb918d6372ab24e82a1959e.tar.gz kernel-1f53b485294509281cb918d6372ab24e82a1959e.zip | |
USB: fix: ohci-at91 mismerge build error
After commit 99f14bd4d1 "Merge 3.13-rc5 into usb-next" (in linux-next as of
today), I'm getting this error building any at91 kernel:
drivers/usb/host/ohci-at91.c: In function 'usb_hcd_at91_probe':
drivers/usb/host/ohci-at91.c:190:4: error: label 'err' used but not defined
goto err;
^
drivers/usb/host/ohci-at91.c: At top level:
drivers/usb/host/ohci-at91.c:206:2: warning: data definition has no type or storage class [enabled by default]
at91_stop_hc(pdev);
^
...
The problem is obviously a mismerge between two unrelated changes that
resulted in missing opening braces.
Signed-off-by: Arnd Bergmann <[email protected]>
Acked-by: Boris BREZILLON <[email protected]>
Signed-off-by: Greg Kroah-Hartman <[email protected]>
Diffstat (limited to 'drivers/usb/core/buffer.c')
0 files changed, 0 insertions, 0 deletions