aboutsummaryrefslogtreecommitdiffstats
path: root/include
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2016-10-06 21:51:59 -0400
committerLinus Torvalds <torvalds@linux-foundation.org>2016-10-06 21:51:59 -0400
commit9a687aea2ffd8ab1e3c6239ea53c0a2209707bd5 (patch)
tree86af40ae7fe57d58e5073374bdb13d6d0e9385e9 /include
parent021723e6c5a5e7b50eb68f9812418406de9860b2 (diff)
parent7ac5d7b1a1254ceb4be19ba93ef7a6ee4e7ac382 (diff)
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
Diffstat (limited to 'include')
-rw-r--r--include/uapi/linux/hsi/hsi_char.h17
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 76160b4f455d..c00a463d55f9 100644
--- a/include/uapi/linux/hsi/hsi_char.h
+++ b/include/uapi/linux/hsi/hsi_char.h
@@ -20,10 +20,11 @@
20 * 02110-1301 USA 20 * 02110-1301 USA
21 */ 21 */
22 22
23
24#ifndef __HSI_CHAR_H 23#ifndef __HSI_CHAR_H
25#define __HSI_CHAR_H 24#define __HSI_CHAR_H
26 25
26#include <linux/types.h>
27
27#define HSI_CHAR_MAGIC 'k' 28#define HSI_CHAR_MAGIC 'k'
28#define HSC_IOW(num, dtype) _IOW(HSI_CHAR_MAGIC, num, dtype) 29#define HSC_IOW(num, dtype) _IOW(HSI_CHAR_MAGIC, num, dtype)
29#define HSC_IOR(num, dtype) _IOR(HSI_CHAR_MAGIC, num, dtype) 30#define HSC_IOR(num, dtype) _IOR(HSI_CHAR_MAGIC, num, dtype)
@@ -48,16 +49,16 @@
48#define HSC_ARB_PRIO 1 49#define HSC_ARB_PRIO 1
49 50
50struct hsc_rx_config { 51struct hsc_rx_config {
51 uint32_t mode; 52 __u32 mode;
52 uint32_t flow; 53 __u32 flow;
53 uint32_t channels; 54 __u32 channels;
54}; 55};
55 56
56struct hsc_tx_config { 57struct hsc_tx_config {
57 uint32_t mode; 58 __u32 mode;
58 uint32_t channels; 59 __u32 channels;
59 uint32_t speed; 60 __u32 speed;
60 uint32_t arb_mode; 61 __u32 arb_mode;
61}; 62};
62 63
63#endif /* __HSI_CHAR_H */ 64#endif /* __HSI_CHAR_H */