summaryrefslogtreecommitdiffstats
path: root/drivers/w1
diff options
context:
space:
mode:
authorAl Viro2007-07-26 18:36:09 +0200
committerLinus Torvalds2007-07-26 20:11:57 +0200
commit0bd8496b5977f6acfd3c16358045c315d610b765 (patch)
treea76b71c6eeacc12fd79ffc3b1fdcf330b26907a0 /drivers/w1
parentxfs ioctl __user annotations (diff)
downloadkernel-qcow2-linux-0bd8496b5977f6acfd3c16358045c315d610b765.tar.gz
kernel-qcow2-linux-0bd8496b5977f6acfd3c16358045c315d610b765.tar.xz
kernel-qcow2-linux-0bd8496b5977f6acfd3c16358045c315d610b765.zip
drivers/ misc __iomem annotations
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'drivers/w1')
-rw-r--r--drivers/w1/masters/ds1wm.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/w1/masters/ds1wm.c b/drivers/w1/masters/ds1wm.c
index 763bc73e5070..4b696641ce33 100644
--- a/drivers/w1/masters/ds1wm.c
+++ b/drivers/w1/masters/ds1wm.c
@@ -85,7 +85,7 @@ static struct {
};
struct ds1wm_data {
- void *map;
+ void __iomem *map;
int bus_shift; /* # of shifts to calc register offsets */
struct platform_device *pdev;
struct ds1wm_platform_data *pdata;