diff options
| author | Russell King <rmk+kernel@arm.linux.org.uk> | 2011-03-16 19:35:27 -0400 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2011-03-16 19:35:27 -0400 |
| commit | 05e34754518b6a90d5c392790c032575fab12d66 (patch) | |
| tree | 318d321262269eff585573ab2acf04a2ff2b65f4 /arch/arm/kernel/armksyms.c | |
| parent | bd1274dc005c2cee41771a7cc616f4709a6e6323 (diff) | |
| parent | b511d75d6150892e67c8ebfa9dc8eb37ebd02aa3 (diff) | |
Merge branch 'p2v' into devel
Conflicts:
arch/arm/kernel/module.c
arch/arm/mach-s5pv210/sleep.S
Diffstat (limited to 'arch/arm/kernel/armksyms.c')
| -rw-r--r-- | arch/arm/kernel/armksyms.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/arch/arm/kernel/armksyms.c b/arch/arm/kernel/armksyms.c index d5d4185f0c24..acca35aebe28 100644 --- a/arch/arm/kernel/armksyms.c +++ b/arch/arm/kernel/armksyms.c | |||
| @@ -164,3 +164,7 @@ EXPORT_SYMBOL(mcount); | |||
| 164 | #endif | 164 | #endif |
| 165 | EXPORT_SYMBOL(__gnu_mcount_nc); | 165 | EXPORT_SYMBOL(__gnu_mcount_nc); |
| 166 | #endif | 166 | #endif |
| 167 | |||
| 168 | #ifdef CONFIG_ARM_PATCH_PHYS_VIRT | ||
| 169 | EXPORT_SYMBOL(__pv_phys_offset); | ||
| 170 | #endif | ||