summaryrefslogtreecommitdiff
path: root/include/linux/istallion.h
diff options
context:
space:
mode:
authorAl Viro <viro@ftp.linux.org.uk>2006-10-11 01:47:27 +0400
committerLinus Torvalds <torvalds@g5.osdl.org>2006-10-11 02:37:22 +0400
commit29756fa3287ff702535e459e7ca8c6038f6e9ae3 (patch)
treeb06d339fc08735ebb052723b86d139bf253ba1ba /include/linux/istallion.h
parent4370df9782a8456039cf85d2b833c2c2097f3ded (diff)
downloadlinux-29756fa3287ff702535e459e7ca8c6038f6e9ae3.tar.xz
[PATCH] trivial iomem annotations: istallion
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'include/linux/istallion.h')
-rw-r--r--include/linux/istallion.h4
1 files changed, 2 insertions, 2 deletions
diff --git a/include/linux/istallion.h b/include/linux/istallion.h
index 1f996621bc9c..b55e2a035605 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];