diff -urN RC14-rc2-git8-bpa_iommu/drivers/net/bmac.c RC14-rc2-git8-bmac/drivers/net/bmac.c --- RC14-rc2-git8-bpa_iommu/drivers/net/bmac.c 2005-08-28 23:09:43.000000000 -0400 +++ RC14-rc2-git8-bmac/drivers/net/bmac.c 2005-09-30 07:34:44.000000000 -0400 @@ -218,7 +218,7 @@ 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); }