X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;ds=sidebyside;f=drivers%2Fnet%2Fsunqe.c;h=1ed3ff5b3519bb7316b6c4f2fcb03158038babe7;hb=c7b5ebbddf7bcd3651947760f423e3783bbe6573;hp=39a4b40b4d2bc183c19e3627bf5150d45acae9c7;hpb=a2c21200f1c81b08cb55e417b68150bba439b646;p=linux-2.6.git

diff --git a/drivers/net/sunqe.c b/drivers/net/sunqe.c
index 39a4b40b4..1ed3ff5b3 100644
--- a/drivers/net/sunqe.c
+++ b/drivers/net/sunqe.c
@@ -49,7 +49,7 @@ static void qe_set_multicast(struct net_device *dev);
 
 #define QEC_RESET_TRIES 200
 
-static inline int qec_global_reset(unsigned long gregs)
+static inline int qec_global_reset(void __iomem *gregs)
 {
 	int tries = QEC_RESET_TRIES;
 
@@ -73,8 +73,8 @@ static inline int qec_global_reset(unsigned long gregs)
 
 static inline int qe_stop(struct sunqe *qep)
 {
-	unsigned long cregs = qep->qcregs;
-	unsigned long mregs = qep->mregs;
+	void __iomem *cregs = qep->qcregs;
+	void __iomem *mregs = qep->mregs;
 	int tries;
 
 	/* Reset the MACE, then the QEC channel. */
@@ -130,9 +130,9 @@ static void qe_init_rings(struct sunqe *qep)
 static int qe_init(struct sunqe *qep, int from_irq)
 {
 	struct sunqec *qecp = qep->parent;
-	unsigned long cregs = qep->qcregs;
-	unsigned long mregs = qep->mregs;
-	unsigned long gregs = qecp->gregs;
+	void __iomem *cregs = qep->qcregs;
+	void __iomem *mregs = qep->mregs;
+	void __iomem *gregs = qecp->gregs;
 	unsigned char *e = &qep->dev->dev_addr[0];
 	u32 tmp;
 	int i;
@@ -699,7 +699,7 @@ static void qe_get_drvinfo(struct net_device *dev, struct ethtool_drvinfo *info)
 static u32 qe_get_link(struct net_device *dev)
 {
 	struct sunqe *qep = dev->priv;
-	unsigned long mregs = qep->mregs;
+	void __iomem *mregs = qep->mregs;
 	u8 phyconfig;
 
 	spin_lock_irq(&qep->lock);