diff options
| author | Ingo Molnar <mingo@elte.hu> | 2010-01-13 03:58:37 -0500 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2010-01-13 04:08:50 -0500 |
| commit | 61405fea92c42d072d9b8bd189689f1502a838af (patch) | |
| tree | 013ea3e7ed71f4114004d5852d40b6e89e128f76 /drivers/usb/early/ehci-dbgp.c | |
| parent | 9c443dfdd31eddea6cbe6ee0ca469fbcc4e1dc3b (diff) | |
| parent | 1703f2c321a8a531c393e137a82602e16c6061cb (diff) | |
Merge branch 'perf/urgent' into perf/core
Merge reason: queue up dependent patch, update to -rc4
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'drivers/usb/early/ehci-dbgp.c')
| -rw-r--r-- | drivers/usb/early/ehci-dbgp.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/usb/early/ehci-dbgp.c b/drivers/usb/early/ehci-dbgp.c index 1206a26ef893..2958a1271b20 100644 --- a/drivers/usb/early/ehci-dbgp.c +++ b/drivers/usb/early/ehci-dbgp.c | |||
| @@ -613,7 +613,7 @@ err: | |||
| 613 | } | 613 | } |
| 614 | EXPORT_SYMBOL_GPL(dbgp_external_startup); | 614 | EXPORT_SYMBOL_GPL(dbgp_external_startup); |
| 615 | 615 | ||
| 616 | static int __init ehci_reset_port(int port) | 616 | static int ehci_reset_port(int port) |
| 617 | { | 617 | { |
| 618 | u32 portsc; | 618 | u32 portsc; |
| 619 | u32 delay_time, delay; | 619 | u32 delay_time, delay; |