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/net/wimax/i2400m/usb-tx.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/net/wimax/i2400m/usb-tx.c')
| -rw-r--r-- | drivers/net/wimax/i2400m/usb-tx.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/wimax/i2400m/usb-tx.c b/drivers/net/wimax/i2400m/usb-tx.c index c65b9979f87e..ac357acfb3e9 100644 --- a/drivers/net/wimax/i2400m/usb-tx.c +++ b/drivers/net/wimax/i2400m/usb-tx.c | |||
| @@ -168,7 +168,7 @@ retry: | |||
| 168 | /* | 168 | /* |
| 169 | * Get the next TX message in the TX FIFO and send it to the device | 169 | * Get the next TX message in the TX FIFO and send it to the device |
| 170 | * | 170 | * |
| 171 | * Note we exit the loop if i2400mu_tx() fails; that funtion only | 171 | * Note we exit the loop if i2400mu_tx() fails; that function only |
| 172 | * fails on hard error (failing to tx a buffer not being one of them, | 172 | * fails on hard error (failing to tx a buffer not being one of them, |
| 173 | * see its doc). | 173 | * see its doc). |
| 174 | * | 174 | * |