From: Al Viro <viro@ftp.linux.org.uk>
Date: Fri, 30 Sep 2005 03:19:43 +0000 (+0100)
Subject: [PATCH] volatile unsigned short f(...) doesn't make sense
X-Git-Tag: v2.6.14-rc3~36
X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=66df3bbf0701b7408a1067c4b819aceee2686bba;p=linux-2.6-omap-h63xx.git

[PATCH] volatile unsigned short f(...) doesn't make sense

Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
---

diff --git a/drivers/net/bmac.c b/drivers/net/bmac.c
index 8dc657fc8af..60dba4a1ca5 100644
--- a/drivers/net/bmac.c
+++ b/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);
 }