diff options
| author | Glenn Elliott <gelliott@cs.unc.edu> | 2012-03-04 19:47:13 -0500 |
|---|---|---|
| committer | Glenn Elliott <gelliott@cs.unc.edu> | 2012-03-04 19:47:13 -0500 |
| commit | c71c03bda1e86c9d5198c5d83f712e695c4f2a1e (patch) | |
| tree | ecb166cb3e2b7e2adb3b5e292245fefd23381ac8 /drivers/usb/host/imx21-dbg.c | |
| parent | ea53c912f8a86a8567697115b6a0d8152beee5c8 (diff) | |
| parent | 6a00f206debf8a5c8899055726ad127dbeeed098 (diff) | |
Merge branch 'mpi-master' into wip-k-fmlpwip-k-fmlp
Conflicts:
litmus/sched_cedf.c
Diffstat (limited to 'drivers/usb/host/imx21-dbg.c')
| -rw-r--r-- | drivers/usb/host/imx21-dbg.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/usb/host/imx21-dbg.c b/drivers/usb/host/imx21-dbg.c index 512f647448ca..6d7533427163 100644 --- a/drivers/usb/host/imx21-dbg.c +++ b/drivers/usb/host/imx21-dbg.c | |||
| @@ -384,7 +384,7 @@ static void debug_isoc_show_one(struct seq_file *s, | |||
| 384 | seq_printf(s, "%s %d:\n" | 384 | seq_printf(s, "%s %d:\n" |
| 385 | "cc=0X%02X\n" | 385 | "cc=0X%02X\n" |
| 386 | "scheduled frame %d (%d)\n" | 386 | "scheduled frame %d (%d)\n" |
| 387 | "submittted frame %d (%d)\n" | 387 | "submitted frame %d (%d)\n" |
| 388 | "completed frame %d (%d)\n" | 388 | "completed frame %d (%d)\n" |
| 389 | "requested length=%d\n" | 389 | "requested length=%d\n" |
| 390 | "completed length=%d\n\n", | 390 | "completed length=%d\n\n", |