Merge branch 'master' of /usr/src/ntfs-2.6/

[sfrench/cifs-2.6.git] / drivers / net / ibm_emac / ibm_emac_rgmii.h

diff --git a/drivers/net/ibm_emac/ibm_emac_rgmii.h b/drivers/net/ibm_emac/ibm_emac_rgmii.h
index a1ffb8a44fffbf5aef6b4cbab91605a4b214022d..7f03d536c9a3e7f7d1f934eaec93f1cb93dbd2e7 100644 (file)
--- a/drivers/net/ibm_emac/ibm_emac_rgmii.h
+++ b/drivers/net/ibm_emac/ibm_emac_rgmii.h
@@ -31,7 +31,7 @@ struct rgmii_regs {
 
 /* RGMII device */
 struct ibm_ocp_rgmii {
-       struct rgmii_regs *base;
+       struct rgmii_regs __iomem *base;
        int users;              /* number of EMACs using this RGMII bridge */
 };