diff options
| author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2017-10-09 03:02:35 -0400 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2017-10-09 03:02:35 -0400 |
| commit | 1236d6bb6e19fc72ffc6bbcdeb1bfefe450e54ee (patch) | |
| tree | 47da3feee8e263e8c9352c85cf518e624be3c211 /include/linux/bitfield.h | |
| parent | 750b1a6894ecc9b178c6e3d0a1170122971b2036 (diff) | |
| parent | 8a5776a5f49812d29fe4b2d0a2d71675c3facf3f (diff) | |
Merge 4.14-rc4 into staging-next
We want the staging/iio fixes in here as well to handle merge issues.
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'include/linux/bitfield.h')
| -rw-r--r-- | include/linux/bitfield.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/linux/bitfield.h b/include/linux/bitfield.h index 8b9d6fff002d..f2deb71958b2 100644 --- a/include/linux/bitfield.h +++ b/include/linux/bitfield.h | |||
| @@ -92,7 +92,7 @@ | |||
| 92 | /** | 92 | /** |
| 93 | * FIELD_GET() - extract a bitfield element | 93 | * FIELD_GET() - extract a bitfield element |
| 94 | * @_mask: shifted mask defining the field's length and position | 94 | * @_mask: shifted mask defining the field's length and position |
| 95 | * @_reg: 32bit value of entire bitfield | 95 | * @_reg: value of entire bitfield |
| 96 | * | 96 | * |
| 97 | * FIELD_GET() extracts the field specified by @_mask from the | 97 | * FIELD_GET() extracts the field specified by @_mask from the |
| 98 | * bitfield passed in as @_reg by masking and shifting it down. | 98 | * bitfield passed in as @_reg by masking and shifting it down. |