diff options
author | Al Viro <viro@ftp.linux.org.uk> | 2006-10-10 17:47:27 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-10-10 18:37:22 -0400 |
commit | 29756fa3287ff702535e459e7ca8c6038f6e9ae3 (patch) | |
tree | b06d339fc08735ebb052723b86d139bf253ba1ba /include/linux/istallion.h | |
parent | 4370df9782a8456039cf85d2b833c2c2097f3ded (diff) |
[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.h | 4 |
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 { | |||
100 | unsigned int iobase; | 100 | unsigned int iobase; |
101 | int iosize; | 101 | int iosize; |
102 | unsigned long memaddr; | 102 | unsigned long memaddr; |
103 | void *membase; | 103 | void __iomem *membase; |
104 | int memsize; | 104 | int memsize; |
105 | int pagesize; | 105 | int pagesize; |
106 | int hostoffset; | 106 | int hostoffset; |
@@ -113,7 +113,7 @@ typedef struct stlibrd { | |||
113 | void (*enable)(struct stlibrd *brdp); | 113 | void (*enable)(struct stlibrd *brdp); |
114 | void (*reenable)(struct stlibrd *brdp); | 114 | void (*reenable)(struct stlibrd *brdp); |
115 | void (*disable)(struct stlibrd *brdp); | 115 | void (*disable)(struct stlibrd *brdp); |
116 | char *(*getmemptr)(struct stlibrd *brdp, unsigned long offset, int line); | 116 | void __iomem *(*getmemptr)(struct stlibrd *brdp, unsigned long offset, int line); |
117 | void (*intr)(struct stlibrd *brdp); | 117 | void (*intr)(struct stlibrd *brdp); |
118 | void (*reset)(struct stlibrd *brdp); | 118 | void (*reset)(struct stlibrd *brdp); |
119 | stliport_t *ports[STL_MAXPORTS]; | 119 | stliport_t *ports[STL_MAXPORTS]; |