diff --git a/[refs] b/[refs] index cf2f98b0c9c5..ff9f8bf493c9 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 32dc496b47eb31f7a1d115a2708e8ef1d054e1fb +refs/heads/master: 5e075cb5cee4faecc82e2b8a04e640176629976e diff --git a/trunk/drivers/net/arm/ep93xx_eth.c b/trunk/drivers/net/arm/ep93xx_eth.c index cc7708775da0..c140c9bb767c 100644 --- a/trunk/drivers/net/arm/ep93xx_eth.c +++ b/trunk/drivers/net/arm/ep93xx_eth.c @@ -153,7 +153,7 @@ struct ep93xx_descs struct ep93xx_priv { struct resource *res; - void *base_addr; + void __iomem *base_addr; int irq; struct ep93xx_descs *descs;