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
This commit is contained in:
@@ -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 */
|
||||
|
Reference in New Issue
Block a user