diff options
| author | Dave Airlie <airlied@starflyer.(none)> | 2005-10-20 04:21:33 -0400 |
|---|---|---|
| committer | Dave Airlie <airlied@linux.ie> | 2005-10-20 04:21:33 -0400 |
| commit | 312f5726055534be1dc9dd369be13aabd2943fcb (patch) | |
| tree | 29394a3f83b4952a73b36a4aa962dfeda839e9db /drivers/net/bmac.c | |
| parent | 3d5efad953c6d5ba11d5bcb584ef8e906f953a73 (diff) | |
| parent | 93918e9afc76717176e9e114e79cdbb602a45ae8 (diff) | |
merge Linus head tree into my drm tree and fix up conflicts
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 | } |