diff options
| author | Jeff Garzik <jgarzik@pobox.com> | 2005-10-04 10:16:31 -0400 |
|---|---|---|
| committer | Jeff Garzik <jgarzik@pobox.com> | 2005-10-04 10:16:31 -0400 |
| commit | 2ee73cc2d507df7b28050fba5d08bd33dd34848c (patch) | |
| tree | af5f33b265318e0f4b61f788691fe4f780ec402c /drivers/net/bmac.c | |
| parent | c1d9728ecc5b560465df3c0c0d3b3825c2710b40 (diff) | |
| parent | ed39f731ab2e77e58122232f6e27333331d7793d (diff) | |
Merge /spare/repo/linux-2.6/
Diffstat (limited to 'drivers/net/bmac.c')
| -rw-r--r-- | drivers/net/bmac.c | 2 |
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 ) | |||
| 218 | 218 | ||
| 219 | 219 | ||
| 220 | static inline | 220 | static inline |
| 221 | volatile unsigned short bmread(struct net_device *dev, unsigned long reg_offset ) | 221 | unsigned short bmread(struct net_device *dev, unsigned long reg_offset ) |
| 222 | { | 222 | { |
| 223 | return in_le16((void __iomem *)dev->base_addr + reg_offset); | 223 | return in_le16((void __iomem *)dev->base_addr + reg_offset); |
| 224 | } | 224 | } |