Merge remote-tracking branch 'hsi/for-next'

diff --git a/include/uapi/linux/hsi/hsi_char.h b/include/uapi/linux/hsi/hsi_char.h
index 76160b4f455dc44ebf9f4b9de0660391819fab73..c00a463d55f9957a2fd59682a97dfb247453c2bb 100644 (file)
--- 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 */