diff options
| author | Jody McIntyre <scjody@modernduck.com> | 2005-12-12 23:34:32 -0500 |
|---|---|---|
| committer | Jody McIntyre <scjody@modernduck.com> | 2005-12-12 23:34:32 -0500 |
| commit | 525352eb6d355bef6adf597252fc6d04f2dbe66c (patch) | |
| tree | 4d2b42372ec0ac985f2775b0ea260c707e93fdd4 /include/asm-arm/io.h | |
| parent | d51e86c18a479f1dbcef3aa20e58ad04d1233016 (diff) | |
| parent | 0e670506668a43e1355b8f10c33d081a676bd521 (diff) | |
Merge with http://kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6.git
Diffstat (limited to 'include/asm-arm/io.h')
| -rw-r--r-- | include/asm-arm/io.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/include/asm-arm/io.h b/include/asm-arm/io.h index ae69db4a1010..0cf4d4f99600 100644 --- a/include/asm-arm/io.h +++ b/include/asm-arm/io.h | |||
| @@ -42,9 +42,9 @@ extern void __raw_writesb(void __iomem *addr, const void *data, int bytelen); | |||
| 42 | extern void __raw_writesw(void __iomem *addr, const void *data, int wordlen); | 42 | extern void __raw_writesw(void __iomem *addr, const void *data, int wordlen); |
| 43 | extern void __raw_writesl(void __iomem *addr, const void *data, int longlen); | 43 | extern void __raw_writesl(void __iomem *addr, const void *data, int longlen); |
| 44 | 44 | ||
| 45 | extern void __raw_readsb(void __iomem *addr, void *data, int bytelen); | 45 | extern void __raw_readsb(const void __iomem *addr, void *data, int bytelen); |
| 46 | extern void __raw_readsw(void __iomem *addr, void *data, int wordlen); | 46 | extern void __raw_readsw(const void __iomem *addr, void *data, int wordlen); |
| 47 | extern void __raw_readsl(void __iomem *addr, void *data, int longlen); | 47 | extern void __raw_readsl(const void __iomem *addr, void *data, int longlen); |
| 48 | 48 | ||
| 49 | #define __raw_writeb(v,a) (__chk_io_ptr(a), *(volatile unsigned char __force *)(a) = (v)) | 49 | #define __raw_writeb(v,a) (__chk_io_ptr(a), *(volatile unsigned char __force *)(a) = (v)) |
| 50 | #define __raw_writew(v,a) (__chk_io_ptr(a), *(volatile unsigned short __force *)(a) = (v)) | 50 | #define __raw_writew(v,a) (__chk_io_ptr(a), *(volatile unsigned short __force *)(a) = (v)) |