1 files changed, 3 insertions, 3 deletions

diff --git a/drivers/net/macb.h b/drivers/net/macb.h
index 8c253db69881..27bf0ae0f0bb 100644
--- a/drivers/net/macb.h
+++ b/drivers/net/macb.h
@@ -250,9 +250,9 @@
 
 /* Register access macros */
 #define macb_readl(port,reg)                            \
-        readl((port)->regs + MACB_##reg)
+        __raw_readl((port)->regs + MACB_##reg)
 #define macb_writel(port,reg,value)                     \
-        writel((value), (port)->regs + MACB_##reg)
+        __raw_writel((value), (port)->regs + MACB_##reg)
 
 struct dma_desc {
         u32     addr;
@@ -377,7 +377,7 @@ struct macb {
 
         unsigned int            rx_pending, tx_pending;
 
-        struct work_struct      periodic_task;
+        struct delayed_work     periodic_task;
 
         struct mutex            mdio_mutex;
         struct completion       mdio_complete;