diff options
| author | Mark Brown <broonie@kernel.org> | 2019-03-19 13:12:18 +0000 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2019-03-19 13:12:18 +0000 |
| commit | c9e48084c88cf901ad0d99a889f2628a5622d90b (patch) | |
| tree | e95ef2305fa14e0c6e218a6aba8de8df4a0b5798 /include/linux/types.h | |
| parent | 04d1446bce279ee6e4c39b3bf705bef3abba008e (diff) | |
| parent | 9e98c678c2d6ae3a17cb2de55d17f69dddaa231b (diff) | |
Merge tag 'v5.1-rc1' into regulator-5.2
Linux 5.1-rc1
Diffstat (limited to 'include/linux/types.h')
| -rw-r--r-- | include/linux/types.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/include/linux/types.h b/include/linux/types.h index c2615d6a019e..cc0dbbe551d5 100644 --- a/include/linux/types.h +++ b/include/linux/types.h @@ -155,9 +155,9 @@ typedef u64 dma_addr_t; typedef u32 dma_addr_t; #endif -typedef unsigned __bitwise gfp_t; -typedef unsigned __bitwise slab_flags_t; -typedef unsigned __bitwise fmode_t; +typedef unsigned int __bitwise gfp_t; +typedef unsigned int __bitwise slab_flags_t; +typedef unsigned int __bitwise fmode_t; #ifdef CONFIG_PHYS_ADDR_T_64BIT typedef u64 phys_addr_t; |