diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2016-10-07 01:51:59 (GMT) |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2016-10-07 01:51:59 (GMT) |
| commit | 9a687aea2ffd8ab1e3c6239ea53c0a2209707bd5 (patch) | |
| tree | 86af40ae7fe57d58e5073374bdb13d6d0e9385e9 | |
| parent | 021723e6c5a5e7b50eb68f9812418406de9860b2 (diff) | |
| parent | 7ac5d7b1a1254ceb4be19ba93ef7a6ee4e7ac382 (diff) | |
| download | linux-9a687aea2ffd8ab1e3c6239ea53c0a2209707bd5.tar.xz | |
Merge tag 'hsi-for-4.9' of git://git.kernel.org/pub/scm/linux/kernel/git/sre/linux-hsi
Pull HSI fix from Sebastian Reichel:
"Fix hsi userspace header"
* tag 'hsi-for-4.9' of git://git.kernel.org/pub/scm/linux/kernel/git/sre/linux-hsi:
HSI: hsi_char.h: use __u32 from linux/types.h
| -rw-r--r-- | include/uapi/linux/hsi/hsi_char.h | 17 |
1 files changed, 9 insertions, 8 deletions
diff --git a/include/uapi/linux/hsi/hsi_char.h b/include/uapi/linux/hsi/hsi_char.h index 76160b4..c00a463 100644 --- a/include/uapi/linux/hsi/hsi_char.h +++ b/include/uapi/linux/hsi/hsi_char.h @@ -20,10 +20,11 @@ * 02110-1301 USA */ - #ifndef __HSI_CHAR_H #define __HSI_CHAR_H +#include <linux/types.h> + #define HSI_CHAR_MAGIC 'k' #define HSC_IOW(num, dtype) _IOW(HSI_CHAR_MAGIC, num, dtype) #define HSC_IOR(num, dtype) _IOR(HSI_CHAR_MAGIC, num, dtype) @@ -48,16 +49,16 @@ #define HSC_ARB_PRIO 1 struct hsc_rx_config { - uint32_t mode; - uint32_t flow; - uint32_t channels; + __u32 mode; + __u32 flow; + __u32 channels; }; struct hsc_tx_config { - uint32_t mode; - uint32_t channels; - uint32_t speed; - uint32_t arb_mode; + __u32 mode; + __u32 channels; + __u32 speed; + __u32 arb_mode; }; #endif /* __HSI_CHAR_H */ |