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/xhci-ext-caps.h | |
| 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/xhci-ext-caps.h')
| -rw-r--r-- | drivers/usb/host/xhci-ext-caps.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/usb/host/xhci-ext-caps.h b/drivers/usb/host/xhci-ext-caps.h index 78c4edac1db1..ce5c9e51748e 100644 --- a/drivers/usb/host/xhci-ext-caps.h +++ b/drivers/usb/host/xhci-ext-caps.h | |||
| @@ -19,8 +19,8 @@ | |||
| 19 | * along with this program; if not, write to the Free Software Foundation, | 19 | * along with this program; if not, write to the Free Software Foundation, |
| 20 | * Inc., 675 Mass Ave, Cambridge, MA 02139, USA. | 20 | * Inc., 675 Mass Ave, Cambridge, MA 02139, USA. |
| 21 | */ | 21 | */ |
| 22 | /* Up to 16 microframes to halt an HC - one microframe is 125 microsectonds */ | 22 | /* Up to 16 ms to halt an HC */ |
| 23 | #define XHCI_MAX_HALT_USEC (16*125) | 23 | #define XHCI_MAX_HALT_USEC (16*1000) |
| 24 | /* HC not running - set to 1 when run/stop bit is cleared. */ | 24 | /* HC not running - set to 1 when run/stop bit is cleared. */ |
| 25 | #define XHCI_STS_HALT (1<<0) | 25 | #define XHCI_STS_HALT (1<<0) |
| 26 | 26 | ||