From ae51b13d602b3dbb6352d248eb0db610300c5c93 Mon Sep 17 00:00:00 2001
From: Al Viro <viro@ftp.linux.org.uk>
Date: Fri, 30 Sep 2005 04:19:43 +0100
Subject: [PATCH] --- yaml --- r: 9476 b: refs/heads/master c:
 66df3bbf0701b7408a1067c4b819aceee2686bba h: refs/heads/master v: v3

---
 [refs]                   | 2 +-
 trunk/drivers/net/bmac.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index bf7284e3468f..aea89b4e2d9b 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: c215a16a4ad620b612b51495cbb99dbbb59bb585
+refs/heads/master: 66df3bbf0701b7408a1067c4b819aceee2686bba
diff --git a/trunk/drivers/net/bmac.c b/trunk/drivers/net/bmac.c
index 8dc657fc8afb..60dba4a1ca5c 100644
--- a/trunk/drivers/net/bmac.c
+++ b/trunk/drivers/net/bmac.c
@@ -218,7 +218,7 @@ void bmwrite(struct net_device *dev, unsigned long reg_offset, unsigned data )
 
 
 static inline
-volatile unsigned short bmread(struct net_device *dev, unsigned long reg_offset )
+unsigned short bmread(struct net_device *dev, unsigned long reg_offset )
 {
 	return in_le16((void __iomem *)dev->base_addr + reg_offset);
 }