Merge branch 'devel-stable' into for-linus

1 files changed, 2 insertions, 4 deletions

diff --git a/arch/arm/include/asm/module.h b/arch/arm/include/asm/module.h
index e358b7966c06..464748b9fd7d 100644
--- a/arch/arm/include/asm/module.h
+++ b/arch/arm/include/asm/module.h
@@ -23,10 +23,8 @@ struct mod_arch_specific {
         struct unwind_table *unwind[ARM_SEC_MAX];
 #endif
 #ifdef CONFIG_ARM_MODULE_PLTS
-        struct elf32_shdr   *core_plt;
-        struct elf32_shdr   *init_plt;
-        int                 core_plt_count;
-        int                 init_plt_count;
+        struct elf32_shdr   *plt;
+        int                 plt_count;
 #endif
 };