diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2009-07-06 19:47:54 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-07-06 19:47:54 -0400 |
| commit | eca4ee0d1615c4fb01e437f674163542ec2dd072 (patch) | |
| tree | b0da76b018547912082946b1f8f210bcd1b745e8 /arch/arm/mm/proc-syms.c | |
| parent | e5a7675dd503f778987ba1f181799ba5aadde319 (diff) | |
| parent | 557dca5f48a45df88a73e69ee0700cfd4e2358c9 (diff) | |
Merge master.kernel.org:/home/rmk/linux-2.6-arm
* master.kernel.org:/home/rmk/linux-2.6-arm:
[ARM] amba: fix amba device resources
[ARM] pgtable: file pte layout documentation
[ARM] pgtable: swp pte layout documentation, definitions, and check
[ARM] export __cpu_flush_dcache_page
[ARM] 5576/1: Update kb9202_defconfig
[ARM] 5581/1: U300 clock updates
[ARM] 5579/1: Updated U300 defconfig
Diffstat (limited to 'arch/arm/mm/proc-syms.c')
| -rw-r--r-- | arch/arm/mm/proc-syms.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/arm/mm/proc-syms.c b/arch/arm/mm/proc-syms.c index 195e48edd8c2..ac5c80062b70 100644 --- a/arch/arm/mm/proc-syms.c +++ b/arch/arm/mm/proc-syms.c | |||
| @@ -27,6 +27,7 @@ EXPORT_SYMBOL(__cpuc_flush_kern_all); | |||
| 27 | EXPORT_SYMBOL(__cpuc_flush_user_all); | 27 | EXPORT_SYMBOL(__cpuc_flush_user_all); |
| 28 | EXPORT_SYMBOL(__cpuc_flush_user_range); | 28 | EXPORT_SYMBOL(__cpuc_flush_user_range); |
| 29 | EXPORT_SYMBOL(__cpuc_coherent_kern_range); | 29 | EXPORT_SYMBOL(__cpuc_coherent_kern_range); |
| 30 | EXPORT_SYMBOL(__cpuc_flush_dcache_page); | ||
| 30 | EXPORT_SYMBOL(dmac_inv_range); /* because of flush_ioremap_region() */ | 31 | EXPORT_SYMBOL(dmac_inv_range); /* because of flush_ioremap_region() */ |
| 31 | #else | 32 | #else |
| 32 | EXPORT_SYMBOL(cpu_cache); | 33 | EXPORT_SYMBOL(cpu_cache); |