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/uwb/reset.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/uwb/reset.c')
| -rw-r--r-- | drivers/uwb/reset.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/uwb/reset.c b/drivers/uwb/reset.c index 27849292b552..3de630b0f691 100644 --- a/drivers/uwb/reset.c +++ b/drivers/uwb/reset.c | |||
| @@ -52,7 +52,7 @@ const char *__strerror[] = { | |||
| 52 | "cancelled", | 52 | "cancelled", |
| 53 | "invalid state", | 53 | "invalid state", |
| 54 | "invalid size", | 54 | "invalid size", |
| 55 | "ack not recieved", | 55 | "ack not received", |
| 56 | "no more asie notification", | 56 | "no more asie notification", |
| 57 | }; | 57 | }; |
| 58 | 58 | ||