X-Git-Url: http://pilppa.org/gitweb/gitweb.cgi?a=blobdiff_plain;f=include%2Flinux%2Fistallion.h;h=b55e2a035605af23dfec9040f9102b5cdebc2892;hb=9ee0779e994c6916863045297b831212e285da3b;hp=1f996621bc9c9cf67a85f71ef665e0eda7615466;hpb=969780f8079994f161de991870feba68f49fc3d7;p=linux-2.6-omap-h63xx.git

diff --git a/include/linux/istallion.h b/include/linux/istallion.h
index 1f996621bc9..b55e2a03560 100644
--- a/include/linux/istallion.h
+++ b/include/linux/istallion.h
@@ -100,7 +100,7 @@ typedef struct stlibrd {
 	unsigned int	iobase;
 	int		iosize;
 	unsigned long	memaddr;
-	void		*membase;
+	void		__iomem *membase;
 	int		memsize;
 	int		pagesize;
 	int		hostoffset;
@@ -113,7 +113,7 @@ typedef struct stlibrd {
 	void		(*enable)(struct stlibrd *brdp);
 	void		(*reenable)(struct stlibrd *brdp);
 	void		(*disable)(struct stlibrd *brdp);
-	char		*(*getmemptr)(struct stlibrd *brdp, unsigned long offset, int line);
+	void		__iomem *(*getmemptr)(struct stlibrd *brdp, unsigned long offset, int line);
 	void		(*intr)(struct stlibrd *brdp);
 	void		(*reset)(struct stlibrd *brdp);
 	stliport_t	*ports[STL_MAXPORTS];