linux/arch/um/include/asm
Paul Menage ab420e6d9c UML: Fix some apparent bitrot
UML: Fix some apparent bitrot

- migration of net_device methods into net_device_ops
- dma_sync_single() changes

Signed-off-by: Paul Menage <menage@google.com>
Acked-by: Amerigo Wang <xiyou.wangcong@gmail.com>
--

This version is split from my earlier patch, including just the
portions that ar required for Linus' tree.

Fixes the following compile errors:

include/linux/dma-mapping.h:113: error: redefinition of 'dma_sync_single'
arch/um/include/asm/dma-mapping.h:84: error: previous definition of 'dma_sync_single' was here
include/linux/dma-mapping.h: In function 'dma_sync_single':
include/linux/dma-mapping.h:117: error: implicit declaration of function 'dma_sync_single_for_cpu'
include/linux/dma-mapping.h: At top level:
include/linux/dma-mapping.h:120: error: redefinition of 'dma_sync_sg'
arch/um/include/asm/dma-mapping.h:91: error: previous definition of 'dma_sync_sg' was here
include/linux/dma-mapping.h: In function 'dma_sync_sg':
include/linux/dma-mapping.h:124: error: implicit declaration of function 'dma_sync_sg_for_cpu'

arch/um/drivers/slirp_kern.c: In function 'slirp_init':
arch/um/drivers/slirp_kern.c:35: error: 'struct net_device' has no member named 'init'
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
2009-06-25 11:22:13 -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
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 x86, um: initial part of asm-um move 2008-10-22 22:55:19 -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 some apparent bitrot 2009-06-25 11:22:13 -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 x86, um: initial part of asm-um move 2008-10-22 22:55:19 -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 x86, um: initial part of asm-um move 2008-10-22 22:55:19 -07:00
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 x86, um: initial part of asm-um move 2008-10-22 22:55:19 -07:00
pda.h uml: remove useless comments 2009-04-01 08:59:17 -07:00
pgalloc.h uml: remove useless comments 2009-04-01 08:59:17 -07:00
pgtable-2level.h x86, um: initial part of asm-um move 2008-10-22 22:55:19 -07:00
pgtable-3level.h uml: remove useless comments 2009-04-01 08:59:17 -07:00
pgtable.h module: merge module_alloc() finally 2009-06-12 21:47:03 +09:30
processor-generic.h x86, um: initial part of asm-um move 2008-10-22 22:55:19 -07:00
ptrace-generic.h x86, um: get rid of more uml asm/arch uses 2008-10-22 22:55:20 -07: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 got broken by commit 30742d5c22 2009-01-05 17:41:45 -08:00
thread_info.h x86, um: initial part of asm-um move 2008-10-22 22:55:19 -07:00
timex.h x86, um: initial part of asm-um move 2008-10-22 22:55:19 -07:00
tlb.h x86, um: initial part of asm-um move 2008-10-22 22:55:19 -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