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-drv.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-drv.c')
| -rw-r--r-- | drivers/usb/c67x00/c67x00-drv.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/usb/c67x00/c67x00-drv.c b/drivers/usb/c67x00/c67x00-drv.c index b6d49234e521..62050f7a4f97 100644 --- a/drivers/usb/c67x00/c67x00-drv.c +++ b/drivers/usb/c67x00/c67x00-drv.c | |||
| @@ -27,7 +27,7 @@ | |||
| 27 | * the link between the common hardware parts and the subdrivers (e.g. | 27 | * the link between the common hardware parts and the subdrivers (e.g. |
| 28 | * interrupt handling). | 28 | * interrupt handling). |
| 29 | * | 29 | * |
| 30 | * The c67x00 has 2 SIE's (serial interface engine) wich can be configured | 30 | * The c67x00 has 2 SIE's (serial interface engine) which can be configured |
| 31 | * to be host, device or OTG (with some limitations, E.G. only SIE1 can be OTG). | 31 | * to be host, device or OTG (with some limitations, E.G. only SIE1 can be OTG). |
| 32 | * | 32 | * |
| 33 | * Depending on the platform configuration, the SIE's are created and | 33 | * Depending on the platform configuration, the SIE's are created and |