diff options
| author | David S. Miller <davem@davemloft.net> | 2011-04-11 16:44:25 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2011-04-11 16:44:25 -0400 |
| commit | 1c01a80cfec6f806246f31ff2680cd3639b30e67 (patch) | |
| tree | 0b554aad2ec1da71ecf6339d4ba51617bfe1dc3c /include/net/wimax.h | |
| parent | c44d79950b2daa1025e62eede73e4e4a274d1ef3 (diff) | |
| parent | 4a9f65f6304a00f6473e83b19c1e83caa1e42530 (diff) | |
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
Conflicts:
drivers/net/smsc911x.c
Diffstat (limited to 'include/net/wimax.h')
| -rw-r--r-- | include/net/wimax.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/net/wimax.h b/include/net/wimax.h index 3461aa1df1e..c799ba7b708 100644 --- a/include/net/wimax.h +++ b/include/net/wimax.h | |||
| @@ -286,7 +286,7 @@ struct wimax_dev; | |||
| 286 | * does not disconnect the device from the bus and return 0. | 286 | * does not disconnect the device from the bus and return 0. |
| 287 | * If that fails, it should resort to some sort of cold or bus | 287 | * If that fails, it should resort to some sort of cold or bus |
| 288 | * reset (even if it implies a bus disconnection and device | 288 | * reset (even if it implies a bus disconnection and device |
| 289 | * dissapearance). In that case, -ENODEV should be returned to | 289 | * disappearance). In that case, -ENODEV should be returned to |
| 290 | * indicate the device is gone. | 290 | * indicate the device is gone. |
| 291 | * This operation has to be synchronous, and return only when the | 291 | * This operation has to be synchronous, and return only when the |
| 292 | * reset is complete. In case of having had to resort to bus/cold | 292 | * reset is complete. In case of having had to resort to bus/cold |