diff options
| author | James Morris <jmorris@namei.org> | 2010-01-17 17:56:22 -0500 |
|---|---|---|
| committer | James Morris <jmorris@namei.org> | 2010-01-17 17:56:22 -0500 |
| commit | 2457552d1e6f3183cd93f81c49a8da5fe8bb0e42 (patch) | |
| tree | 7ca46caa910012d75617700e4083b3657053cb31 /include/linux/chio.h | |
| parent | 19439d05b88dafc4e55d9ffce84ccc27cf8b2bcc (diff) | |
| parent | 6ccf80eb15ccaca4d3f1ab5162b9ded5eecd9971 (diff) | |
Merge branch 'master' into next
Diffstat (limited to 'include/linux/chio.h')
| -rw-r--r-- | include/linux/chio.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/linux/chio.h b/include/linux/chio.h index 519248d8b2b6..d9bac7f97282 100644 --- a/include/linux/chio.h +++ b/include/linux/chio.h | |||
| @@ -21,7 +21,7 @@ | |||
| 21 | * query vendor-specific element types | 21 | * query vendor-specific element types |
| 22 | * | 22 | * |
| 23 | * accessing elements works by specifing type and unit of the element. | 23 | * accessing elements works by specifing type and unit of the element. |
| 24 | * for eample, storage elements are addressed with type = CHET_ST and | 24 | * for example, storage elements are addressed with type = CHET_ST and |
| 25 | * unit = 0 .. cp_nslots-1 | 25 | * unit = 0 .. cp_nslots-1 |
| 26 | * | 26 | * |
| 27 | */ | 27 | */ |