History

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

Linus Torvalds committed 10 years ago

Commit 9a687ae2 parents 021723e 7ac5d7b1 file · +9 −8Browse files

Showing the changes to include/uapi/linux (1 of 1 file). Show all

Unified · Split

include/uapi/linux/hsi/hsi_char.h+9−8
@@ -20,10 +20,11 @@ · 19 unmodified lines
20 * 02110-1301 USA20 * 02110-1301 USA
21 */21 */
22 22
23
24#ifndef __HSI_CHAR_H23#ifndef __HSI_CHAR_H
25#define __HSI_CHAR_H24#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 @@ · 18 unmodified lines
48#define HSC_ARB_PRIO 149#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 */

Keyboard shortcuts

General

Show keyboard shortcuts
?
Focus the current search
/

Issues and pull requests

Open filters
f

Issues, pull requests and Inbox

Select next item
j↓
Select previous item
k↑
Open selected item
Enter
Dismiss filters or clear selection
Esc

Repository code

Go to file
t