diff options
author | Russell King <rmk+kernel@arm.linux.org.uk> | 2011-10-18 16:40:54 +0400 |
---|---|---|
committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2011-10-18 16:40:54 +0400 |
commit | cefd3e71efca6f4ef7f06f1fc507771d76072741 (patch) | |
tree | d76cb7969435d5eccdbd3d081555d0a8203ede4a /arch/arm/include/asm/module.h | |
parent | a26bce1220a4c5a7a074a779e6aad3cae63a94f7 (diff) | |
parent | 0cdc8b921d68817b687755b4f6ae20cd8ff1d026 (diff) | |
download | linux-cefd3e71efca6f4ef7f06f1fc507771d76072741.tar.xz |
Merge branch 'mach_memory_h' of git://git.linaro.org/people/nico/linux into devel-stable
Diffstat (limited to 'arch/arm/include/asm/module.h')
-rw-r--r-- | arch/arm/include/asm/module.h | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/arch/arm/include/asm/module.h b/arch/arm/include/asm/module.h index 543b44916d2c..6c6809f982f1 100644 --- a/arch/arm/include/asm/module.h +++ b/arch/arm/include/asm/module.h @@ -31,11 +31,7 @@ struct mod_arch_specific { /* Add __virt_to_phys patching state as well */ #ifdef CONFIG_ARM_PATCH_PHYS_VIRT -#ifdef CONFIG_ARM_PATCH_PHYS_VIRT_16BIT -#define MODULE_ARCH_VERMAGIC_P2V "p2v16 " -#else #define MODULE_ARCH_VERMAGIC_P2V "p2v8 " -#endif #else #define MODULE_ARCH_VERMAGIC_P2V "" #endif |