diff options
| author | Linus Torvalds <torvalds@g5.osdl.org> | 2006-06-20 22:38:12 (GMT) |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-06-20 22:38:12 (GMT) |
| commit | 077e98945db7e54a9865b5f29a1f02f531eca414 (patch) | |
| tree | bb24d180075a2d5ac35bd0d893bdc867405bee03 /drivers/char/rio/rio.h | |
| parent | d9eaec9e295a84a80b663996d0489fcff3a1dca9 (diff) | |
| parent | 92af11cdec410f5de4e8d702d24e1672ce26a1f6 (diff) | |
| download | linux-fsl-qoriq-077e98945db7e54a9865b5f29a1f02f531eca414.tar.xz | |
Merge branch 'rio.b19' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/bird
* 'rio.b19' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/bird:
[PATCH] missing readb/readw in rio
[PATCH] copy_to_user() from iomem is a bad thing
[PATCH] forgotten swap of copyout() arguments
[PATCH] handling rio MEMDUMP
[PATCH] fix rio_copy_to_card() for OLDPCI case
[PATCH] uses of ->Copy() in rioroute are bogus
[PATCH] bogus order of copy_from_user() arguments
[PATCH] rio ->Copy() expects the sourse as first argument
[PATCH] trivial annotations in rio
Diffstat (limited to 'drivers/char/rio/rio.h')
| -rw-r--r-- | drivers/char/rio/rio.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/char/rio/rio.h b/drivers/char/rio/rio.h index b4c9187..1bf3622 100644 --- a/drivers/char/rio/rio.h +++ b/drivers/char/rio/rio.h @@ -129,8 +129,8 @@ ** RIO_OBJ takes hostp->Caddr and a UNIX pointer to an object and ** returns the offset into the DP RAM area. */ -#define RIO_PTR(C,O) (((unsigned char *)(C))+(0xFFFF&(O))) -#define RIO_OFF(C,O) ((long)(O)-(long)(C)) +#define RIO_PTR(C,O) (((unsigned char __iomem *)(C))+(0xFFFF&(O))) +#define RIO_OFF(C,O) ((unsigned char __iomem *)(O)-(unsigned char __iomem *)(C)) /* ** How to convert from various different device number formats: |