diff options
-rw-r--r-- | drivers/net/macb.c | 2 | ||||
-rw-r--r-- | drivers/net/macb.h | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/drivers/net/macb.c b/drivers/net/macb.c index 3496d19c55e1..25b559b5d5ed 100644 --- a/drivers/net/macb.c +++ b/drivers/net/macb.c | |||
@@ -264,7 +264,7 @@ static void macb_update_stats(struct macb *bp) | |||
264 | WARN_ON((unsigned long)(end - p - 1) != (MACB_TPF - MACB_PFR) / 4); | 264 | WARN_ON((unsigned long)(end - p - 1) != (MACB_TPF - MACB_PFR) / 4); |
265 | 265 | ||
266 | for(; p < end; p++, reg++) | 266 | for(; p < end; p++, reg++) |
267 | *p += readl(reg); | 267 | *p += __raw_readl(reg); |
268 | } | 268 | } |
269 | 269 | ||
270 | static void macb_periodic_task(struct work_struct *work) | 270 | static void macb_periodic_task(struct work_struct *work) |
diff --git a/drivers/net/macb.h b/drivers/net/macb.h index e3fcb2e06fdc..27bf0ae0f0bb 100644 --- a/drivers/net/macb.h +++ b/drivers/net/macb.h | |||
@@ -250,9 +250,9 @@ | |||
250 | 250 | ||
251 | /* Register access macros */ | 251 | /* Register access macros */ |
252 | #define macb_readl(port,reg) \ | 252 | #define macb_readl(port,reg) \ |
253 | readl((port)->regs + MACB_##reg) | 253 | __raw_readl((port)->regs + MACB_##reg) |
254 | #define macb_writel(port,reg,value) \ | 254 | #define macb_writel(port,reg,value) \ |
255 | writel((value), (port)->regs + MACB_##reg) | 255 | __raw_writel((value), (port)->regs + MACB_##reg) |
256 | 256 | ||
257 | struct dma_desc { | 257 | struct dma_desc { |
258 | u32 addr; | 258 | u32 addr; |