Merge branch '2022-08-04-assorted-fixed'

[platform/kernel/u-boot.git] / drivers / net / ftgmac100.h

diff --git a/drivers/net/ftgmac100.h b/drivers/net/ftgmac100.h
index 439b14d..f7874ae 100644 (file)
--- a/drivers/net/ftgmac100.h
+++ b/drivers/net/ftgmac100.h
@@ -13,6 +13,7 @@
 #define __FTGMAC100_H
 
 /* The registers offset table of ftgmac100 */
+#include <linux/bitops.h>
 struct ftgmac100 {
        unsigned int    isr;            /* 0x00 */
        unsigned int    ier;            /* 0x04 */
@@ -182,7 +183,7 @@ struct ftgmac100_txdes {
        unsigned int    txdes1;
        unsigned int    txdes2; /* not used by HW */
        unsigned int    txdes3; /* TXBUF_BADR */
-} __attribute__ ((aligned(16)));
+} __aligned(16);
 
 #define FTGMAC100_TXDES0_TXBUF_SIZE(x) ((x) & 0x3fff)
 #define FTGMAC100_TXDES0_EDOTR         BIT(15)
@@ -208,7 +209,7 @@ struct ftgmac100_rxdes {
        unsigned int    rxdes1;
        unsigned int    rxdes2; /* not used by HW */
        unsigned int    rxdes3; /* RXBUF_BADR */
-} __attribute__ ((aligned(16)));
+} __aligned(16);
 
 #define FTGMAC100_RXDES0_VDBC(x)       ((x) & 0x3fff)
 #define FTGMAC100_RXDES0_EDORR         BIT(15)