linux/arch/um/include/asm
Miklos Szeredi f3c072ad72 uml: fix compile error in dma_get_cache_alignment()
Fix uml compile error:

  include/linux/dma-mapping.h:145: error: redefinition of 'dma_get_cache_alignment'
  arch/um/include/asm/dma-mapping.h:99: note: previous definition of 'dma_get_cache_alignment' was here

Introduced by commit 4565f0170d ("dma-mapping: unify
dma_get_cache_alignment implementations")

Signed-off-by: Miklos Szeredi <mszeredi@suse.cz>
Cc: Jeff Dike <jdike@addtoit.com>
Cc: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
2010-08-20 09:34:55 -07:00
..
a.out-core.h x86, um: initial part of asm-um move 2008-10-22 22:55:19 -07:00
apic.h x86, um: initial part of asm-um move 2008-10-22 22:55:19 -07:00
arch_hweight.h um, hweight: Fix UML boot crash due to x86 optimized hweight 2010-06-10 15:24:30 -07:00
asm-offsets.h kbuild: move asm-offsets.h to include/generated 2009-12-12 13:08:14 +01:00
auxvec.h x86, um: initial part of asm-um move 2008-10-22 22:55:19 -07:00
bugs.h x86, um: initial part of asm-um move 2008-10-22 22:55:19 -07:00
cache.h x86, um: initial part of asm-um move 2008-10-22 22:55:19 -07:00
checksum.h x86, um: initial part of asm-um move 2008-10-22 22:55:19 -07:00
common.lds.S um: Clean up linker script using standard macros. 2009-09-24 17:16:22 -07:00
cputime.h x86, um: initial part of asm-um move 2008-10-22 22:55:19 -07:00
current.h x86, um: initial part of asm-um move 2008-10-22 22:55:19 -07:00
delay.h x86, um: initial part of asm-um move 2008-10-22 22:55:19 -07:00
desc.h x86, um: initial part of asm-um move 2008-10-22 22:55:19 -07:00
device.h x86, um: initial part of asm-um move 2008-10-22 22:55:19 -07:00
dma-mapping.h uml: fix compile error in dma_get_cache_alignment() 2010-08-20 09:34:55 -07:00
dma.h x86, um: initial part of asm-um move 2008-10-22 22:55:19 -07:00
emergency-restart.h x86, um: initial part of asm-um move 2008-10-22 22:55:19 -07:00
fixmap.h x86, um: get rid of uml highmem.h 2008-10-22 22:55:21 -07:00
ftrace.h tracing: make CALLER_ADDRx overwriteable 2009-03-02 16:49:37 -05:00
futex.h x86, um: initial part of asm-um move 2008-10-22 22:55:19 -07:00
hardirq.h um: convert to asm-generic/hardirq.h 2009-09-22 07:17:45 -07:00
hw_irq.h x86, um: initial part of asm-um move 2008-10-22 22:55:19 -07:00
io.h x86, um: initial part of asm-um move 2008-10-22 22:55:19 -07:00
irq.h x86, um: initial part of asm-um move 2008-10-22 22:55:19 -07:00
irq_regs.h x86, um: initial part of asm-um move 2008-10-22 22:55:19 -07:00
irq_vectors.h uml: remove useless comments 2009-04-01 08:59:17 -07:00
irqflags.h x86, um: initial part of asm-um move 2008-10-22 22:55:19 -07:00
kdebug.h x86, um: initial part of asm-um move 2008-10-22 22:55:19 -07:00
kmap_types.h x86, um: initial part of asm-um move 2008-10-22 22:55:19 -07:00
mmu.h uml: remove useless comments 2009-04-01 08:59:17 -07:00
mmu_context.h cpumask: use mm_cpumask() wrapper: um 2009-09-24 09:34:51 +09:30
mutex.h x86, um: initial part of asm-um move 2008-10-22 22:55:19 -07:00
page.h asm-generic: rename page.h and uaccess.h 2009-06-11 21:02:17 +02:00
page_offset.h x86, um: initial part of asm-um move 2008-10-22 22:55:19 -07:00
param.h x86, um: initial part of asm-um move 2008-10-22 22:55:19 -07:00
pci.h PCI: remove pcibios_scan_all_fns() 2009-09-09 13:29:18 -07:00
pda.h uml: remove useless comments 2009-04-01 08:59:17 -07:00
pgalloc.h mm: Pass virtual address to [__]p{te,ud,md}_free_tlb() 2009-07-27 12:10:38 -07:00
pgtable-2level.h x86, um: initial part of asm-um move 2008-10-22 22:55:19 -07:00
pgtable-3level.h um, x86: Cast to (u64 *) inside set_64bit() 2010-08-03 07:00:16 -07:00
pgtable.h MM: Pass a PTE pointer to update_mmu_cache() rather than the PTE itself 2010-02-20 16:41:46 +00:00
processor-generic.h x86, um: initial part of asm-um move 2008-10-22 22:55:19 -07:00
ptrace-generic.h um: use generic ptrace_resume code 2010-03-12 15:52:39 -08:00
required-features.h x86, um: initial part of asm-um move 2008-10-22 22:55:19 -07:00
sections.h x86, um: initial part of asm-um move 2008-10-22 22:55:19 -07:00
segment.h x86, um: initial part of asm-um move 2008-10-22 22:55:19 -07:00
setup.h x86, um: initial part of asm-um move 2008-10-22 22:55:19 -07:00
smp.h x86, um: initial part of asm-um move 2008-10-22 22:55:19 -07:00
system.h UML: Clean up asm/system.h 2010-04-20 16:32:47 +02:00
thread_info.h add descriptive comment for TIF_MEMDIE task flag declaration. 2010-05-14 11:13:27 +02:00
timex.h x86, um: initial part of asm-um move 2008-10-22 22:55:19 -07:00
tlb.h mm: Pass virtual address to [__]p{te,ud,md}_free_tlb() 2009-07-27 12:10:38 -07:00
tlbflush.h x86, um: initial part of asm-um move 2008-10-22 22:55:19 -07:00
topology.h x86, um: initial part of asm-um move 2008-10-22 22:55:19 -07:00
uaccess.h x86, um: initial part of asm-um move 2008-10-22 22:55:19 -07:00
xor.h x86, um: initial part of asm-um move 2008-10-22 22:55:19 -07:00