diff options
| author | Sascha Hauer <s.hauer@pengutronix.de> | 2021-02-22 10:39:38 +0100 |
|---|---|---|
| committer | Sascha Hauer <s.hauer@pengutronix.de> | 2021-02-22 10:39:38 +0100 |
| commit | a017e79fccb66e2c2e75ac44e5c3e214b509dd2a (patch) | |
| tree | 6880209d0dfda025f46961739abc762eb055c79f /arch | |
| parent | a4d21cda3ca4fa82bbd71026c072af991c189400 (diff) | |
| parent | 582523142975c7993af81ff8007ff8e0e96f6dee (diff) | |
| download | barebox-a017e79fccb66e2c2e75ac44e5c3e214b509dd2a.tar.gz barebox-a017e79fccb66e2c2e75ac44e5c3e214b509dd2a.tar.xz | |
Merge branch 'for-next/asm-io'
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/arm/include/asm/io.h | 4 | ||||
| -rw-r--r-- | arch/powerpc/include/asm/io.h | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/arch/arm/include/asm/io.h b/arch/arm/include/asm/io.h index 072b47317c..b442a37b9c 100644 --- a/arch/arm/include/asm/io.h +++ b/arch/arm/include/asm/io.h @@ -3,6 +3,10 @@ #define IO_SPACE_LIMIT 0 +#define memcpy_fromio memcpy_fromio +#define memcpy_toio memcpy_toio +#define memset_io memset_io + #include <asm-generic/io.h> #include <asm-generic/bitio.h> diff --git a/arch/powerpc/include/asm/io.h b/arch/powerpc/include/asm/io.h index 025c06f3b7..8488c36f65 100644 --- a/arch/powerpc/include/asm/io.h +++ b/arch/powerpc/include/asm/io.h @@ -86,10 +86,6 @@ extern void _outsl_ns(volatile u32 *port, const void *buf, int nl); #define IO_SPACE_LIMIT ~0 -#define memset_io(a,b,c) memset((void *)(a),(b),(c)) -#define memcpy_fromio(a,b,c) memcpy((a),(void *)(b),(c)) -#define memcpy_toio(a,b,c) memcpy((void *)(a),(b),(c)) - /* * Enforce In-order Execution of I/O: * Acts as a barrier to ensure all previous I/O accesses have |