kernel-ark/arch/microblaze/include/asm
Grant Likely cf9b59e9d3 Merge remote branch 'origin' into secretlab/next-devicetree
Merging in current state of Linus' tree to deal with merge conflicts and
build failures in vio.c after merge.

Conflicts:
	drivers/i2c/busses/i2c-cpm.c
	drivers/i2c/busses/i2c-mpc.c
	drivers/net/gianfar.c

Also fixed up one line in arch/powerpc/kernel/vio.c to use the
correct node pointer.

Signed-off-by: Grant Likely <grant.likely@secretlab.ca>
2010-05-22 00:36:56 -06:00
..
asm-compat.h microblaze: Copy ppc asm-compat.h for clean handling of constants in asm and C 2009-09-22 10:10:06 +02:00
asm-offsets.h kbuild: move asm-offsets.h to include/generated 2009-12-12 13:08:14 +01:00
atomic.h microblaze: convert all simple headers to use asm-generic 2009-07-06 10:26:55 +02:00
auxvec.h
bitops.h microblaze: convert all simple headers to use asm-generic 2009-07-06 10:26:55 +02:00
bitsperlong.h
bug.h microblaze: convert all simple headers to use asm-generic 2009-07-06 10:26:55 +02:00
bugs.h microblaze: convert all simple headers to use asm-generic 2009-07-06 10:26:55 +02:00
byteorder.h
cache.h microblaze: Define correct L1_CACHE_SHIFT value 2010-05-06 11:21:59 +02:00
cacheflush.h microblaze: Support for WB cache 2009-12-14 08:45:10 +01:00
checksum.h
clinkage.h
cpuinfo.h microblaze: Extend cpuinfo for support write-back caches 2009-12-14 08:44:58 +01:00
cputable.h
cputime.h
current.h
delay.h
device.h arch/microblaze: Move dma_mask from of_device into pdev_archdata 2010-05-22 00:10:40 -06:00
div64.h
dma-mapping.h microblaze: Implement __dma_sync_page 2010-03-11 13:58:11 +01:00
dma.h microblaze: Add isa_dma_bridge_buggy to dma.h 2010-05-06 11:21:58 +02:00
elf.h elf: kill USE_ELF_CORE_DUMP 2009-12-16 07:20:12 -08:00
emergency-restart.h
entry.h percpu: remove per_cpu__ prefix. 2009-10-29 22:34:15 +09:00
errno.h
exceptions.h microblaze: Remove ancient code 2010-05-06 11:21:58 +02:00
fb.h microblaze: convert all simple headers to use asm-generic 2009-07-06 10:26:55 +02:00
fcntl.h
flat.h
ftrace.h microblaze: ftrace: Add dynamic trace support 2009-12-14 08:44:01 +01:00
futex.h microblaze: Fix futex code 2010-04-07 07:27:25 +02:00
gpio.h
hardirq.h microblaze: use the generic ack_bad_irq implementation 2009-08-18 10:33:29 +02:00
hw_irq.h
io.h microblaze: Remove ancient code 2010-05-06 11:21:58 +02:00
ioctl.h
ioctls.h
ipcbuf.h
irq_regs.h
irq.h microblaze: Add irq_create_{of_,}mapping functions 2010-03-11 13:59:28 +01:00
irqflags.h microblaze: Add TRACE_IRQFLAGS_SUPPORT 2009-12-14 08:40:09 +01:00
Kbuild
kdebug.h
kmap_types.h
linkage.h
lmb.h
local.h
mman.h
mmu_context_mm.h
mmu_context.h microblaze: convert all simple headers to use asm-generic 2009-07-06 10:26:55 +02:00
mmu.h microblaze: convert all simple headers to use asm-generic 2009-07-06 10:26:55 +02:00
module.h microblaze: convert all simple headers to use asm-generic 2009-07-06 10:26:55 +02:00
msgbuf.h
mutex.h
namei.h
of_device.h arch/microblaze: Move dma_mask from of_device into pdev_archdata 2010-05-22 00:10:40 -06:00
of_platform.h
page.h microblaze: Fix kmalloc alignment on non-coherent DMA platforms 2010-05-06 11:21:59 +02:00
param.h
parport.h microblaze: convert all simple headers to use asm-generic 2009-07-06 10:26:55 +02:00
pci-bridge.h microblaze: Add pci-bridge.h 2010-03-11 14:01:43 +01:00
pci.h microblaze: pci-dma: use include/linux/dma-mapping.h 2010-05-06 11:21:59 +02:00
percpu.h
pgalloc.h microblaze: Quiet section mismatch warnings for MMU version 2010-05-06 11:21:58 +02:00
pgtable.h microblaze: Fix consistent code 2010-05-06 11:21:59 +02:00
poll.h
posix_types.h
processor.h microblaze: Remove segment.h 2010-04-01 08:38:19 +02:00
prom.h microblaze: Enable PCI, missing files 2010-03-11 14:04:27 +01:00
ptrace.h microblaze: Add PT_ macros for special purpose regs 2010-01-18 16:35:39 +01:00
pvr.h microblaze: Checking DTS against PVR for write-back cache 2009-12-14 08:45:05 +01:00
registers.h
resource.h
scatterlist.h microblaze: convert all simple headers to use asm-generic 2009-07-06 10:26:55 +02:00
sections.h
selfmod.h
sembuf.h
serial.h microblaze: convert all simple headers to use asm-generic 2009-07-06 10:26:55 +02:00
setup.h microblaze: GPIO reset support 2009-12-14 08:40:08 +01:00
shmbuf.h
shmparam.h microblaze: convert all simple headers to use asm-generic 2009-07-06 10:26:55 +02:00
sigcontext.h
siginfo.h
signal.h microblaze: clean up signal handling 2009-07-06 10:26:57 +02:00
socket.h
sockios.h
stat.h
statfs.h
string.h
swab.h
syscall.h microblaze: Implement include/asm/syscall.h. 2009-09-21 14:29:21 +02:00
syscalls.h microblaze: use generic syscalls.h 2009-07-06 10:26:59 +02:00
system.h Revert "microblaze: Kill NET_SKB_PAD and NET_IP_ALIGN overrides." 2010-05-07 02:55:33 -07:00
termbits.h
termios.h
thread_info.h add descriptive comment for TIF_MEMDIE task flag declaration. 2010-05-14 11:13:27 +02:00
timex.h microblaze: convert all simple headers to use asm-generic 2009-07-06 10:26:55 +02:00
tlb.h microblaze: Define tlb_flush macro 2009-07-27 07:39:53 +02:00
tlbflush.h microblaze: Fix TLB macros 2010-04-01 08:38:24 +02:00
topology.h
types.h
uaccess.h microblaze: fix get_user/put_user side-effects 2010-05-13 09:21:14 +02:00
ucontext.h
unaligned.h
unistd.h microblaze: Enable accept4 syscall 2010-01-18 16:35:27 +01:00
user.h
vga.h microblaze: convert all simple headers to use asm-generic 2009-07-06 10:26:55 +02:00
xor.h