summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAl Viro <viro@ftp.linux.org.uk>2005-09-30 04:19:43 +0100
committerLinus Torvalds <torvalds@g5.osdl.org>2005-09-30 08:42:24 -0700
commit66df3bbf0701b7408a1067c4b819aceee2686bba (patch)
tree4823f28eaad12058917d2ef948175b6afd7b1c67
parentc215a16a4ad620b612b51495cbb99dbbb59bb585 (diff)
downloadlwn-66df3bbf0701b7408a1067c4b819aceee2686bba.tar.gz
lwn-66df3bbf0701b7408a1067c4b819aceee2686bba.zip
[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>
-rw-r--r--drivers/net/bmac.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/bmac.c b/drivers/net/bmac.c
index 8dc657fc8afb..60dba4a1ca5c 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);
}