diff options
| author | Olof Johansson <olof@lixom.net> | 2012-03-13 21:02:11 -0700 |
|---|---|---|
| committer | Olof Johansson <olof@lixom.net> | 2012-03-13 21:02:11 -0700 |
| commit | accf709b39a9cdbeaf6233000ccb9af966fd691e (patch) | |
| tree | 6b6a034d2d61c4b0f0f3bb59c673dd7b16d19c11 /arch/arm/include/asm/assembler.h | |
| parent | 708795cd975579ba7115666f585c428f8cebd572 (diff) | |
| parent | a2a47ca36642e3995e982957bc42678cf11ca6ac (diff) | |
Merge branch 'io-cleanup-for-3.4' of git://sources.calxeda.com/kernel/linux into next/cleanup2
* 'io-cleanup-for-3.4' of git://sources.calxeda.com/kernel/linux:
ARM: __io abuse cleanup
ARM: create a common IOMEM definition
ARM: iop13xx: fix missing declaration of iop13xx_init_early
ARM: fix ioremap/iounmap for !CONFIG_MMU
Diffstat (limited to 'arch/arm/include/asm/assembler.h')
| -rw-r--r-- | arch/arm/include/asm/assembler.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/arch/arm/include/asm/assembler.h b/arch/arm/include/asm/assembler.h index 62f8095d46d..88374dd30fb 100644 --- a/arch/arm/include/asm/assembler.h +++ b/arch/arm/include/asm/assembler.h @@ -23,6 +23,8 @@ #include <asm/ptrace.h> #include <asm/domain.h> +#define IOMEM(x) (x) + /* * Endian independent macros for shifting bytes within registers. */ |