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/c67x00/c67x00-sched.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/c67x00/c67x00-sched.c')
| -rw-r--r-- | drivers/usb/c67x00/c67x00-sched.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/usb/c67x00/c67x00-sched.c b/drivers/usb/c67x00/c67x00-sched.c index f6b3c253f3fa..a03fbc15fa9c 100644 --- a/drivers/usb/c67x00/c67x00-sched.c +++ b/drivers/usb/c67x00/c67x00-sched.c | |||
| @@ -907,7 +907,7 @@ static inline int c67x00_end_of_data(struct c67x00_td *td) | |||
| 907 | 907 | ||
| 908 | /* Remove all td's from the list which come | 908 | /* Remove all td's from the list which come |
| 909 | * after last_td and are meant for the same pipe. | 909 | * after last_td and are meant for the same pipe. |
| 910 | * This is used when a short packet has occured */ | 910 | * This is used when a short packet has occurred */ |
| 911 | static inline void c67x00_clear_pipe(struct c67x00_hcd *c67x00, | 911 | static inline void c67x00_clear_pipe(struct c67x00_hcd *c67x00, |
| 912 | struct c67x00_td *last_td) | 912 | struct c67x00_td *last_td) |
| 913 | { | 913 | { |