diff options
author | David Vrabel <david.vrabel@citrix.com> | 2014-04-28 10:31:04 +0100 |
---|---|---|
committer | David Vrabel <david.vrabel@citrix.com> | 2014-04-28 10:31:04 +0100 |
commit | 67dadcb324c2fe059cb2c35f8b80df42bb23f7c4 (patch) | |
tree | 3521a2a9e05a7de426ab50bc7685489ad6340e54 /arch/arm/kernel/armksyms.c | |
parent | eb47f71200b7d5b4c8c1f8c75675f592d855aafd (diff) | |
parent | e26a9e00afc482b971afcaef1db8c9034d4d6d7c (diff) | |
download | linux-67dadcb324c2fe059cb2c35f8b80df42bb23f7c4.tar.bz2 |
Merge commit 'e26a9e0' into stable/for-linus-3.15
Diffstat (limited to 'arch/arm/kernel/armksyms.c')
-rw-r--r-- | arch/arm/kernel/armksyms.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/kernel/armksyms.c b/arch/arm/kernel/armksyms.c index 85e664b6a5f1..f7b450f97e68 100644 --- a/arch/arm/kernel/armksyms.c +++ b/arch/arm/kernel/armksyms.c @@ -158,6 +158,6 @@ EXPORT_SYMBOL(__gnu_mcount_nc); #endif #ifdef CONFIG_ARM_PATCH_PHYS_VIRT -EXPORT_SYMBOL(__pv_phys_offset); +EXPORT_SYMBOL(__pv_phys_pfn_offset); EXPORT_SYMBOL(__pv_offset); #endif |