Merge branch 'merge-fixes' into devel

1 files changed, 10 insertions, 10 deletions

diff --git a/drivers/net/skfp/h/fplustm.h b/drivers/net/skfp/h/fplustm.h
index 98bbf654d12f..6d738e1e2393 100644
--- a/drivers/net/skfp/h/fplustm.h
+++ b/drivers/net/skfp/h/fplustm.h
@@ -50,12 +50,12 @@ struct err_st {
  *      Transmit Descriptor struct
  */
 struct s_smt_fp_txd {
-        u_int txd_tbctrl ;              /* transmit buffer control */
-        u_int txd_txdscr ;              /* transmit frame status word */
-        u_int txd_tbadr ;               /* physical tx buffer address */
-        u_int txd_ntdadr ;              /* physical pointer to the next TxD */
+        __le32 txd_tbctrl ;             /* transmit buffer control */
+        __le32 txd_txdscr ;             /* transmit frame status word */
+        __le32 txd_tbadr ;              /* physical tx buffer address */
+        __le32 txd_ntdadr ;             /* physical pointer to the next TxD */
 #ifdef  ENA_64BIT_SUP
-        u_int txd_tbadr_hi ;            /* physical tx buffer addr (high dword)*/
+        __le32 txd_tbadr_hi ;           /* physical tx buffer addr (high dword)*/
 #endif
         char far *txd_virt ;            /* virtual pointer to the data frag */
                                         /* virt pointer to the next TxD */
@@ -67,12 +67,12 @@ struct s_smt_fp_txd {
  *      Receive Descriptor struct
  */
 struct s_smt_fp_rxd {
-        u_int rxd_rbctrl ;              /* receive buffer control */
-        u_int rxd_rfsw ;                /* receive frame status word */
-        u_int rxd_rbadr ;               /* physical rx buffer address */
-        u_int rxd_nrdadr ;              /* physical pointer to the next RxD */
+        __le32 rxd_rbctrl ;             /* receive buffer control */
+        __le32 rxd_rfsw ;               /* receive frame status word */
+        __le32 rxd_rbadr ;              /* physical rx buffer address */
+        __le32 rxd_nrdadr ;             /* physical pointer to the next RxD */
 #ifdef  ENA_64BIT_SUP
-        u_int rxd_rbadr_hi ;            /* physical tx buffer addr (high dword)*/
+        __le32 rxd_rbadr_hi ;           /* physical tx buffer addr (high dword)*/
 #endif
         char far *rxd_virt ;            /* virtual pointer to the data frag */
                                         /* virt pointer to the next RxD */