diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2009-12-17 15:53:41 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-12-17 15:53:41 -0800 |
| commit | a695bc683609a2b815915e4cfcd93e4ccc0e2cae (patch) | |
| tree | 824d6b35783317f929fe13a9efcc8a35d5e00311 /arch/arm/mm/proc-syms.c | |
| parent | 6485536bcf499839a54dcda8a8d47ea0bd29b375 (diff) | |
| parent | 6665398afafcb1c75d933c1452a9010644aba3e6 (diff) | |
| download | kernel-crypto-a695bc683609a2b815915e4cfcd93e4ccc0e2cae.tar.gz kernel-crypto-a695bc683609a2b815915e4cfcd93e4ccc0e2cae.tar.xz kernel-crypto-a695bc683609a2b815915e4cfcd93e4ccc0e2cae.zip | |
Merge branch 'for-linus' of master.kernel.org:/home/rmk/linux-2.6-arm
* 'for-linus' of master.kernel.org:/home/rmk/linux-2.6-arm:
PCMCIA: fix pxa2xx_lubbock modular build error
[ARM] Update mach-types
[ARM] pxa: fix no reference of cpu_is_pxa25x() in devices.c
[ARM] pxa/cm-x300: add PWM backlight support
revert "[ARM] pxa/cm-x300: add PWM backlight support"
ARM: use flush_kernel_dcache_area() for dmabounce
ARM: add size argument to __cpuc_flush_dcache_page
ARM: 5848/1: kill flush_ioremap_region()
ARM: cache-l2x0: make better use of background cache handling
ARM: cache-l2x0: avoid taking spinlock for every iteration
[ARM] Kirkwood: Add LaCie Network Space v2 support
ARM: dove: fix the mm mmu flags of the pj4 procinfo
Diffstat (limited to 'arch/arm/mm/proc-syms.c')
| -rw-r--r-- | arch/arm/mm/proc-syms.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/arch/arm/mm/proc-syms.c b/arch/arm/mm/proc-syms.c index ac5c80062b7..3e6210b4d6d 100644 --- a/arch/arm/mm/proc-syms.c +++ b/arch/arm/mm/proc-syms.c @@ -27,8 +27,7 @@ EXPORT_SYMBOL(__cpuc_flush_kern_all); EXPORT_SYMBOL(__cpuc_flush_user_all); EXPORT_SYMBOL(__cpuc_flush_user_range); EXPORT_SYMBOL(__cpuc_coherent_kern_range); -EXPORT_SYMBOL(__cpuc_flush_dcache_page); -EXPORT_SYMBOL(dmac_inv_range); /* because of flush_ioremap_region() */ +EXPORT_SYMBOL(__cpuc_flush_dcache_area); #else EXPORT_SYMBOL(cpu_cache); #endif |