diff options
Diffstat (limited to '')
-rw-r--r-- | arch/cris/include/asm/Kbuild (renamed from include/asm-cris/Kbuild) | 0 | ||||
-rw-r--r-- | arch/cris/include/asm/atomic.h (renamed from include/asm-cris/atomic.h) | 2 | ||||
-rw-r--r-- | arch/cris/include/asm/auxvec.h (renamed from include/asm-cris/auxvec.h) | 0 | ||||
-rw-r--r-- | arch/cris/include/asm/axisflashmap.h (renamed from include/asm-cris/axisflashmap.h) | 0 | ||||
-rw-r--r-- | arch/cris/include/asm/bitops.h (renamed from include/asm-cris/bitops.h) | 2 | ||||
-rw-r--r-- | arch/cris/include/asm/bug.h (renamed from include/asm-cris/bug.h) | 2 | ||||
-rw-r--r-- | arch/cris/include/asm/bugs.h (renamed from include/asm-cris/bugs.h) | 0 | ||||
-rw-r--r-- | arch/cris/include/asm/byteorder.h (renamed from include/asm-cris/byteorder.h) | 2 | ||||
-rw-r--r-- | arch/cris/include/asm/cache.h (renamed from include/asm-cris/cache.h) | 2 | ||||
-rw-r--r-- | arch/cris/include/asm/cacheflush.h (renamed from include/asm-cris/cacheflush.h) | 0 | ||||
-rw-r--r-- | arch/cris/include/asm/checksum.h (renamed from include/asm-cris/checksum.h) | 2 | ||||
-rw-r--r-- | arch/cris/include/asm/cputime.h (renamed from include/asm-cris/cputime.h) | 0 | ||||
-rw-r--r-- | arch/cris/include/asm/current.h (renamed from include/asm-cris/current.h) | 0 | ||||
-rw-r--r-- | arch/cris/include/asm/delay.h (renamed from include/asm-cris/delay.h) | 2 | ||||
-rw-r--r-- | arch/cris/include/asm/device.h (renamed from include/asm-cris/device.h) | 0 | ||||
-rw-r--r-- | arch/cris/include/asm/div64.h (renamed from include/asm-cris/div64.h) | 0 | ||||
-rw-r--r-- | arch/cris/include/asm/dma-mapping.h (renamed from include/asm-cris/dma-mapping.h) | 0 | ||||
-rw-r--r-- | arch/cris/include/asm/dma.h (renamed from include/asm-cris/dma.h) | 2 | ||||
-rw-r--r-- | arch/cris/include/asm/elf.h (renamed from include/asm-cris/elf.h) | 2 | ||||
-rw-r--r-- | arch/cris/include/asm/emergency-restart.h (renamed from include/asm-cris/emergency-restart.h) | 0 | ||||
-rw-r--r-- | arch/cris/include/asm/errno.h (renamed from include/asm-cris/errno.h) | 0 | ||||
-rw-r--r-- | arch/cris/include/asm/eshlibld.h (renamed from include/asm-cris/eshlibld.h) | 0 | ||||
-rw-r--r-- | arch/cris/include/asm/ethernet.h (renamed from include/asm-cris/ethernet.h) | 0 | ||||
-rw-r--r-- | arch/cris/include/asm/etraxgpio.h (renamed from include/asm-cris/etraxgpio.h) | 0 | ||||
-rw-r--r-- | arch/cris/include/asm/etraxi2c.h (renamed from include/asm-cris/etraxi2c.h) | 0 | ||||
-rw-r--r-- | arch/cris/include/asm/fasttimer.h (renamed from include/asm-cris/fasttimer.h) | 0 | ||||
-rw-r--r-- | arch/cris/include/asm/fb.h (renamed from include/asm-cris/fb.h) | 0 | ||||
-rw-r--r-- | arch/cris/include/asm/fcntl.h (renamed from include/asm-cris/fcntl.h) | 0 | ||||
-rw-r--r-- | arch/cris/include/asm/futex.h (renamed from include/asm-cris/futex.h) | 0 | ||||
-rw-r--r-- | arch/cris/include/asm/hardirq.h (renamed from include/asm-cris/hardirq.h) | 0 | ||||
-rw-r--r-- | arch/cris/include/asm/hw_irq.h (renamed from include/asm-cris/hw_irq.h) | 0 | ||||
-rw-r--r-- | arch/cris/include/asm/io.h (renamed from include/asm-cris/io.h) | 2 | ||||
-rw-r--r-- | arch/cris/include/asm/ioctl.h (renamed from include/asm-cris/ioctl.h) | 0 | ||||
-rw-r--r-- | arch/cris/include/asm/ioctls.h (renamed from include/asm-cris/ioctls.h) | 0 | ||||
-rw-r--r-- | arch/cris/include/asm/ipcbuf.h (renamed from include/asm-cris/ipcbuf.h) | 0 | ||||
-rw-r--r-- | arch/cris/include/asm/irq.h (renamed from include/asm-cris/irq.h) | 2 | ||||
-rw-r--r-- | arch/cris/include/asm/irq_regs.h (renamed from include/asm-cris/irq_regs.h) | 0 | ||||
-rw-r--r-- | arch/cris/include/asm/kdebug.h (renamed from include/asm-cris/kdebug.h) | 0 | ||||
-rw-r--r-- | arch/cris/include/asm/kmap_types.h (renamed from include/asm-cris/kmap_types.h) | 0 | ||||
-rw-r--r-- | arch/cris/include/asm/linkage.h (renamed from include/asm-cris/linkage.h) | 0 | ||||
-rw-r--r-- | arch/cris/include/asm/local.h (renamed from include/asm-cris/local.h) | 0 | ||||
-rw-r--r-- | arch/cris/include/asm/mman.h (renamed from include/asm-cris/mman.h) | 0 | ||||
-rw-r--r-- | arch/cris/include/asm/mmu.h (renamed from include/asm-cris/mmu.h) | 2 | ||||
-rw-r--r-- | arch/cris/include/asm/mmu_context.h (renamed from include/asm-cris/mmu_context.h) | 0 | ||||
-rw-r--r-- | arch/cris/include/asm/module.h (renamed from include/asm-cris/module.h) | 0 | ||||
-rw-r--r-- | arch/cris/include/asm/msgbuf.h (renamed from include/asm-cris/msgbuf.h) | 0 | ||||
-rw-r--r-- | arch/cris/include/asm/mutex.h (renamed from include/asm-cris/mutex.h) | 0 | ||||
-rw-r--r-- | arch/cris/include/asm/page.h (renamed from include/asm-cris/page.h) | 2 | ||||
-rw-r--r-- | arch/cris/include/asm/param.h (renamed from include/asm-cris/param.h) | 0 | ||||
-rw-r--r-- | arch/cris/include/asm/pci.h (renamed from include/asm-cris/pci.h) | 0 | ||||
-rw-r--r-- | arch/cris/include/asm/percpu.h (renamed from include/asm-cris/percpu.h) | 0 | ||||
-rw-r--r-- | arch/cris/include/asm/pgalloc.h (renamed from include/asm-cris/pgalloc.h) | 0 | ||||
-rw-r--r-- | arch/cris/include/asm/pgtable.h (renamed from include/asm-cris/pgtable.h) | 2 | ||||
-rw-r--r-- | arch/cris/include/asm/poll.h (renamed from include/asm-cris/poll.h) | 0 | ||||
-rw-r--r-- | arch/cris/include/asm/posix_types.h (renamed from include/asm-cris/posix_types.h) | 0 | ||||
-rw-r--r-- | arch/cris/include/asm/processor.h (renamed from include/asm-cris/processor.h) | 2 | ||||
-rw-r--r-- | arch/cris/include/asm/ptrace.h (renamed from include/asm-cris/ptrace.h) | 2 | ||||
-rw-r--r-- | arch/cris/include/asm/resource.h (renamed from include/asm-cris/resource.h) | 0 | ||||
-rw-r--r-- | arch/cris/include/asm/rs485.h (renamed from include/asm-cris/rs485.h) | 0 | ||||
-rw-r--r-- | arch/cris/include/asm/rtc.h (renamed from include/asm-cris/rtc.h) | 0 | ||||
-rw-r--r-- | arch/cris/include/asm/scatterlist.h (renamed from include/asm-cris/scatterlist.h) | 0 | ||||
-rw-r--r-- | arch/cris/include/asm/sections.h (renamed from include/asm-cris/sections.h) | 0 | ||||
-rw-r--r-- | arch/cris/include/asm/segment.h (renamed from include/asm-cris/segment.h) | 0 | ||||
-rw-r--r-- | arch/cris/include/asm/sembuf.h (renamed from include/asm-cris/sembuf.h) | 0 | ||||
-rw-r--r-- | arch/cris/include/asm/setup.h (renamed from include/asm-cris/setup.h) | 0 | ||||
-rw-r--r-- | arch/cris/include/asm/shmbuf.h (renamed from include/asm-cris/shmbuf.h) | 0 | ||||
-rw-r--r-- | arch/cris/include/asm/shmparam.h (renamed from include/asm-cris/shmparam.h) | 0 | ||||
-rw-r--r-- | arch/cris/include/asm/sigcontext.h (renamed from include/asm-cris/sigcontext.h) | 0 | ||||
-rw-r--r-- | arch/cris/include/asm/siginfo.h (renamed from include/asm-cris/siginfo.h) | 0 | ||||
-rw-r--r-- | arch/cris/include/asm/signal.h (renamed from include/asm-cris/signal.h) | 0 | ||||
-rw-r--r-- | arch/cris/include/asm/smp.h (renamed from include/asm-cris/smp.h) | 0 | ||||
-rw-r--r-- | arch/cris/include/asm/socket.h (renamed from include/asm-cris/socket.h) | 0 | ||||
-rw-r--r-- | arch/cris/include/asm/sockios.h (renamed from include/asm-cris/sockios.h) | 0 | ||||
-rw-r--r-- | arch/cris/include/asm/spinlock.h | 1 | ||||
-rw-r--r-- | arch/cris/include/asm/stat.h (renamed from include/asm-cris/stat.h) | 0 | ||||
-rw-r--r-- | arch/cris/include/asm/statfs.h (renamed from include/asm-cris/statfs.h) | 0 | ||||
-rw-r--r-- | arch/cris/include/asm/string.h (renamed from include/asm-cris/string.h) | 0 | ||||
-rw-r--r-- | arch/cris/include/asm/sync_serial.h (renamed from include/asm-cris/sync_serial.h) | 0 | ||||
-rw-r--r-- | arch/cris/include/asm/system.h (renamed from include/asm-cris/system.h) | 2 | ||||
-rw-r--r-- | arch/cris/include/asm/termbits.h (renamed from include/asm-cris/termbits.h) | 0 | ||||
-rw-r--r-- | arch/cris/include/asm/termios.h (renamed from include/asm-cris/termios.h) | 0 | ||||
-rw-r--r-- | arch/cris/include/asm/thread_info.h (renamed from include/asm-cris/thread_info.h) | 2 | ||||
-rw-r--r-- | arch/cris/include/asm/timex.h (renamed from include/asm-cris/timex.h) | 2 | ||||
-rw-r--r-- | arch/cris/include/asm/tlb.h (renamed from include/asm-cris/tlb.h) | 2 | ||||
-rw-r--r-- | arch/cris/include/asm/tlbflush.h (renamed from include/asm-cris/tlbflush.h) | 0 | ||||
-rw-r--r-- | arch/cris/include/asm/topology.h (renamed from include/asm-cris/topology.h) | 0 | ||||
-rw-r--r-- | arch/cris/include/asm/types.h (renamed from include/asm-cris/types.h) | 0 | ||||
-rw-r--r-- | arch/cris/include/asm/uaccess.h (renamed from include/asm-cris/uaccess.h) | 2 | ||||
-rw-r--r-- | arch/cris/include/asm/ucontext.h (renamed from include/asm-cris/ucontext.h) | 0 | ||||
-rw-r--r-- | arch/cris/include/asm/unaligned.h (renamed from include/asm-cris/unaligned.h) | 0 | ||||
-rw-r--r-- | arch/cris/include/asm/unistd.h (renamed from include/asm-cris/unistd.h) | 2 | ||||
-rw-r--r-- | arch/cris/include/asm/user.h (renamed from include/asm-cris/user.h) | 2 |
92 files changed, 24 insertions, 23 deletions
diff --git a/include/asm-cris/Kbuild b/arch/cris/include/asm/Kbuild index d5b631935ec8..d5b631935ec8 100644 --- a/include/asm-cris/Kbuild +++ b/arch/cris/include/asm/Kbuild diff --git a/include/asm-cris/atomic.h b/arch/cris/include/asm/atomic.h index 5fc87768774a..f71ea686a2ea 100644 --- a/include/asm-cris/atomic.h +++ b/arch/cris/include/asm/atomic.h @@ -6,7 +6,7 @@ #include <linux/compiler.h> #include <asm/system.h> -#include <asm/arch/atomic.h> +#include <arch/atomic.h> /* * Atomic operations that C can't guarantee us. Useful for diff --git a/include/asm-cris/auxvec.h b/arch/cris/include/asm/auxvec.h index cb30b01bf19f..cb30b01bf19f 100644 --- a/include/asm-cris/auxvec.h +++ b/arch/cris/include/asm/auxvec.h diff --git a/include/asm-cris/axisflashmap.h b/arch/cris/include/asm/axisflashmap.h index 015ca5445ddd..015ca5445ddd 100644 --- a/include/asm-cris/axisflashmap.h +++ b/arch/cris/include/asm/axisflashmap.h diff --git a/include/asm-cris/bitops.h b/arch/cris/include/asm/bitops.h index 75ea6e096483..c0e62f811e09 100644 --- a/include/asm-cris/bitops.h +++ b/arch/cris/include/asm/bitops.h @@ -18,7 +18,7 @@ #error only <linux/bitops.h> can be included directly #endif -#include <asm/arch/bitops.h> +#include <arch/bitops.h> #include <asm/system.h> #include <asm/atomic.h> #include <linux/compiler.h> diff --git a/include/asm-cris/bug.h b/arch/cris/include/asm/bug.h index fee12d4ae683..3b3958963801 100644 --- a/include/asm-cris/bug.h +++ b/arch/cris/include/asm/bug.h @@ -1,4 +1,4 @@ #ifndef _CRIS_BUG_H #define _CRIS_BUG_H -#include <asm/arch/bug.h> +#include <arch/bug.h> #endif diff --git a/include/asm-cris/bugs.h b/arch/cris/include/asm/bugs.h index c5907aac1007..c5907aac1007 100644 --- a/include/asm-cris/bugs.h +++ b/arch/cris/include/asm/bugs.h diff --git a/include/asm-cris/byteorder.h b/arch/cris/include/asm/byteorder.h index 0cd9db1cc888..cc8e418cfd14 100644 --- a/include/asm-cris/byteorder.h +++ b/arch/cris/include/asm/byteorder.h @@ -4,7 +4,7 @@ #ifdef __GNUC__ #ifdef __KERNEL__ -#include <asm/arch/byteorder.h> +#include <arch/byteorder.h> /* defines are necessary because the other files detect the presence * of a defined __arch_swab32, not an inline diff --git a/include/asm-cris/cache.h b/arch/cris/include/asm/cache.h index 46a3b26e205a..a692b9fba8b9 100644 --- a/include/asm-cris/cache.h +++ b/arch/cris/include/asm/cache.h @@ -1,6 +1,6 @@ #ifndef _ASM_CACHE_H #define _ASM_CACHE_H -#include <asm/arch/cache.h> +#include <arch/cache.h> #endif /* _ASM_CACHE_H */ diff --git a/include/asm-cris/cacheflush.h b/arch/cris/include/asm/cacheflush.h index cf60e3f69f8d..cf60e3f69f8d 100644 --- a/include/asm-cris/cacheflush.h +++ b/arch/cris/include/asm/cacheflush.h diff --git a/include/asm-cris/checksum.h b/arch/cris/include/asm/checksum.h index c6c5be62c698..75dcb77d6cb0 100644 --- a/include/asm-cris/checksum.h +++ b/arch/cris/include/asm/checksum.h @@ -3,7 +3,7 @@ #ifndef _CRIS_CHECKSUM_H #define _CRIS_CHECKSUM_H -#include <asm/arch/checksum.h> +#include <arch/checksum.h> /* * computes the checksum of a memory block at buff, length len, diff --git a/include/asm-cris/cputime.h b/arch/cris/include/asm/cputime.h index 4446a65656fa..4446a65656fa 100644 --- a/include/asm-cris/cputime.h +++ b/arch/cris/include/asm/cputime.h diff --git a/include/asm-cris/current.h b/arch/cris/include/asm/current.h index 5f5c0efd00be..5f5c0efd00be 100644 --- a/include/asm-cris/current.h +++ b/arch/cris/include/asm/current.h diff --git a/include/asm-cris/delay.h b/arch/cris/include/asm/delay.h index 123e19aef49d..75ec581bfead 100644 --- a/include/asm-cris/delay.h +++ b/arch/cris/include/asm/delay.h @@ -7,7 +7,7 @@ * Delay routines, using a pre-computed "loops_per_second" value. */ -#include <asm/arch/delay.h> +#include <arch/delay.h> /* Use only for very small delays ( < 1 msec). */ diff --git a/include/asm-cris/device.h b/arch/cris/include/asm/device.h index d8f9872b0e2d..d8f9872b0e2d 100644 --- a/include/asm-cris/device.h +++ b/arch/cris/include/asm/device.h diff --git a/include/asm-cris/div64.h b/arch/cris/include/asm/div64.h index 6cd978cefb28..6cd978cefb28 100644 --- a/include/asm-cris/div64.h +++ b/arch/cris/include/asm/div64.h diff --git a/include/asm-cris/dma-mapping.h b/arch/cris/include/asm/dma-mapping.h index da8ef8e8f842..da8ef8e8f842 100644 --- a/include/asm-cris/dma-mapping.h +++ b/arch/cris/include/asm/dma-mapping.h diff --git a/include/asm-cris/dma.h b/arch/cris/include/asm/dma.h index 6f188dc56138..30fd715fa589 100644 --- a/include/asm-cris/dma.h +++ b/arch/cris/include/asm/dma.h @@ -3,7 +3,7 @@ #ifndef _ASM_DMA_H #define _ASM_DMA_H -#include <asm/arch/dma.h> +#include <arch/dma.h> /* it's useless on the Etrax, but unfortunately needed by the new bootmem allocator (but this should do it for this) */ diff --git a/include/asm-cris/elf.h b/arch/cris/include/asm/elf.h index f0d17fbc81ba..0f51b10b9f4f 100644 --- a/include/asm-cris/elf.h +++ b/arch/cris/include/asm/elf.h @@ -45,7 +45,7 @@ typedef unsigned long elf_fpregset_t; #define ELF_DATA ELFDATA2LSB #define ELF_ARCH EM_CRIS -#include <asm/arch/elf.h> +#include <arch/elf.h> /* The master for these definitions is {binutils}/include/elf/cris.h: */ /* User symbols in this file have a leading underscore. */ diff --git a/include/asm-cris/emergency-restart.h b/arch/cris/include/asm/emergency-restart.h index 108d8c48e42e..108d8c48e42e 100644 --- a/include/asm-cris/emergency-restart.h +++ b/arch/cris/include/asm/emergency-restart.h diff --git a/include/asm-cris/errno.h b/arch/cris/include/asm/errno.h index 2bf5eb5fa773..2bf5eb5fa773 100644 --- a/include/asm-cris/errno.h +++ b/arch/cris/include/asm/errno.h diff --git a/include/asm-cris/eshlibld.h b/arch/cris/include/asm/eshlibld.h index 10ce36cf79a9..10ce36cf79a9 100644 --- a/include/asm-cris/eshlibld.h +++ b/arch/cris/include/asm/eshlibld.h diff --git a/include/asm-cris/ethernet.h b/arch/cris/include/asm/ethernet.h index 4d58652c3a49..4d58652c3a49 100644 --- a/include/asm-cris/ethernet.h +++ b/arch/cris/include/asm/ethernet.h diff --git a/include/asm-cris/etraxgpio.h b/arch/cris/include/asm/etraxgpio.h index 38f1c8e1770c..38f1c8e1770c 100644 --- a/include/asm-cris/etraxgpio.h +++ b/arch/cris/include/asm/etraxgpio.h diff --git a/include/asm-cris/etraxi2c.h b/arch/cris/include/asm/etraxi2c.h index e369a7620893..e369a7620893 100644 --- a/include/asm-cris/etraxi2c.h +++ b/arch/cris/include/asm/etraxi2c.h diff --git a/include/asm-cris/fasttimer.h b/arch/cris/include/asm/fasttimer.h index 8f8a8d6c9653..8f8a8d6c9653 100644 --- a/include/asm-cris/fasttimer.h +++ b/arch/cris/include/asm/fasttimer.h diff --git a/include/asm-cris/fb.h b/arch/cris/include/asm/fb.h index c7df38030992..c7df38030992 100644 --- a/include/asm-cris/fb.h +++ b/arch/cris/include/asm/fb.h diff --git a/include/asm-cris/fcntl.h b/arch/cris/include/asm/fcntl.h index 46ab12db5739..46ab12db5739 100644 --- a/include/asm-cris/fcntl.h +++ b/arch/cris/include/asm/fcntl.h diff --git a/include/asm-cris/futex.h b/arch/cris/include/asm/futex.h index 6a332a9f099c..6a332a9f099c 100644 --- a/include/asm-cris/futex.h +++ b/arch/cris/include/asm/futex.h diff --git a/include/asm-cris/hardirq.h b/arch/cris/include/asm/hardirq.h index 74178adeb1cd..74178adeb1cd 100644 --- a/include/asm-cris/hardirq.h +++ b/arch/cris/include/asm/hardirq.h diff --git a/include/asm-cris/hw_irq.h b/arch/cris/include/asm/hw_irq.h index 298066020af2..298066020af2 100644 --- a/include/asm-cris/hw_irq.h +++ b/arch/cris/include/asm/hw_irq.h diff --git a/include/asm-cris/io.h b/arch/cris/include/asm/io.h index b87ce63f531f..32567bc2a421 100644 --- a/include/asm-cris/io.h +++ b/arch/cris/include/asm/io.h @@ -2,7 +2,7 @@ #define _ASM_CRIS_IO_H #include <asm/page.h> /* for __va, __pa */ -#include <asm/arch/io.h> +#include <arch/io.h> #include <linux/kernel.h> struct cris_io_operations diff --git a/include/asm-cris/ioctl.h b/arch/cris/include/asm/ioctl.h index b279fe06dfe5..b279fe06dfe5 100644 --- a/include/asm-cris/ioctl.h +++ b/arch/cris/include/asm/ioctl.h diff --git a/include/asm-cris/ioctls.h b/arch/cris/include/asm/ioctls.h index 4f4e52531fa0..4f4e52531fa0 100644 --- a/include/asm-cris/ioctls.h +++ b/arch/cris/include/asm/ioctls.h diff --git a/include/asm-cris/ipcbuf.h b/arch/cris/include/asm/ipcbuf.h index 8b0c18b02844..8b0c18b02844 100644 --- a/include/asm-cris/ipcbuf.h +++ b/arch/cris/include/asm/ipcbuf.h diff --git a/include/asm-cris/irq.h b/arch/cris/include/asm/irq.h index 998cce9f3200..ce0fcf540d62 100644 --- a/include/asm-cris/irq.h +++ b/arch/cris/include/asm/irq.h @@ -1,7 +1,7 @@ #ifndef _ASM_IRQ_H #define _ASM_IRQ_H -#include <asm/arch/irq.h> +#include <arch/irq.h> static inline int irq_canonicalize(int irq) { diff --git a/include/asm-cris/irq_regs.h b/arch/cris/include/asm/irq_regs.h index 3dd9c0b70270..3dd9c0b70270 100644 --- a/include/asm-cris/irq_regs.h +++ b/arch/cris/include/asm/irq_regs.h diff --git a/include/asm-cris/kdebug.h b/arch/cris/include/asm/kdebug.h index 6ece1b037665..6ece1b037665 100644 --- a/include/asm-cris/kdebug.h +++ b/arch/cris/include/asm/kdebug.h diff --git a/include/asm-cris/kmap_types.h b/arch/cris/include/asm/kmap_types.h index 492988cb9077..492988cb9077 100644 --- a/include/asm-cris/kmap_types.h +++ b/arch/cris/include/asm/kmap_types.h diff --git a/include/asm-cris/linkage.h b/arch/cris/include/asm/linkage.h index 291c2d01c44f..291c2d01c44f 100644 --- a/include/asm-cris/linkage.h +++ b/arch/cris/include/asm/linkage.h diff --git a/include/asm-cris/local.h b/arch/cris/include/asm/local.h index c11c530f74d0..c11c530f74d0 100644 --- a/include/asm-cris/local.h +++ b/arch/cris/include/asm/local.h diff --git a/include/asm-cris/mman.h b/arch/cris/include/asm/mman.h index 1c35e1b66b46..1c35e1b66b46 100644 --- a/include/asm-cris/mman.h +++ b/arch/cris/include/asm/mman.h diff --git a/include/asm-cris/mmu.h b/arch/cris/include/asm/mmu.h index c40a1bcad06c..e06ea94ecffd 100644 --- a/include/asm-cris/mmu.h +++ b/arch/cris/include/asm/mmu.h @@ -5,6 +5,6 @@ #ifndef _CRIS_MMU_H #define _CRIS_MMU_H -#include <asm/arch/mmu.h> +#include <arch/mmu.h> #endif diff --git a/include/asm-cris/mmu_context.h b/arch/cris/include/asm/mmu_context.h index 72ba08dcfd18..72ba08dcfd18 100644 --- a/include/asm-cris/mmu_context.h +++ b/arch/cris/include/asm/mmu_context.h diff --git a/include/asm-cris/module.h b/arch/cris/include/asm/module.h index 7ee72311bd78..7ee72311bd78 100644 --- a/include/asm-cris/module.h +++ b/arch/cris/include/asm/module.h diff --git a/include/asm-cris/msgbuf.h b/arch/cris/include/asm/msgbuf.h index ada63df1d574..ada63df1d574 100644 --- a/include/asm-cris/msgbuf.h +++ b/arch/cris/include/asm/msgbuf.h diff --git a/include/asm-cris/mutex.h b/arch/cris/include/asm/mutex.h index 458c1f7fbc18..458c1f7fbc18 100644 --- a/include/asm-cris/mutex.h +++ b/arch/cris/include/asm/mutex.h diff --git a/include/asm-cris/page.h b/arch/cris/include/asm/page.h index d19272ba6b69..f3fdbd09c34c 100644 --- a/include/asm-cris/page.h +++ b/arch/cris/include/asm/page.h @@ -1,7 +1,7 @@ #ifndef _CRIS_PAGE_H #define _CRIS_PAGE_H -#include <asm/arch/page.h> +#include <arch/page.h> #include <linux/const.h> /* PAGE_SHIFT determines the page size */ diff --git a/include/asm-cris/param.h b/arch/cris/include/asm/param.h index 0e47994e40be..0e47994e40be 100644 --- a/include/asm-cris/param.h +++ b/arch/cris/include/asm/param.h diff --git a/include/asm-cris/pci.h b/arch/cris/include/asm/pci.h index 730ce40fdd0f..730ce40fdd0f 100644 --- a/include/asm-cris/pci.h +++ b/arch/cris/include/asm/pci.h diff --git a/include/asm-cris/percpu.h b/arch/cris/include/asm/percpu.h index 6db9b43cf80a..6db9b43cf80a 100644 --- a/include/asm-cris/percpu.h +++ b/arch/cris/include/asm/percpu.h diff --git a/include/asm-cris/pgalloc.h b/arch/cris/include/asm/pgalloc.h index a1ba761d0573..a1ba761d0573 100644 --- a/include/asm-cris/pgalloc.h +++ b/arch/cris/include/asm/pgalloc.h diff --git a/include/asm-cris/pgtable.h b/arch/cris/include/asm/pgtable.h index 829e7a7d9fb9..50aa974aa834 100644 --- a/include/asm-cris/pgtable.h +++ b/arch/cris/include/asm/pgtable.h @@ -12,7 +12,7 @@ #include <linux/sched.h> #include <asm/mmu.h> #endif -#include <asm/arch/pgtable.h> +#include <arch/pgtable.h> /* * The Linux memory management assumes a three-level page table setup. On diff --git a/include/asm-cris/poll.h b/arch/cris/include/asm/poll.h index c98509d3149e..c98509d3149e 100644 --- a/include/asm-cris/poll.h +++ b/arch/cris/include/asm/poll.h diff --git a/include/asm-cris/posix_types.h b/arch/cris/include/asm/posix_types.h index ce3fb25a460b..ce3fb25a460b 100644 --- a/include/asm-cris/posix_types.h +++ b/arch/cris/include/asm/posix_types.h diff --git a/include/asm-cris/processor.h b/arch/cris/include/asm/processor.h index cdc0c1dce6be..3f7248f7a1c9 100644 --- a/include/asm-cris/processor.h +++ b/arch/cris/include/asm/processor.h @@ -13,7 +13,7 @@ #include <asm/system.h> #include <asm/page.h> #include <asm/ptrace.h> -#include <asm/arch/processor.h> +#include <arch/processor.h> struct task_struct; diff --git a/include/asm-cris/ptrace.h b/arch/cris/include/asm/ptrace.h index d910925e3174..6618893bfe8e 100644 --- a/include/asm-cris/ptrace.h +++ b/arch/cris/include/asm/ptrace.h @@ -1,7 +1,7 @@ #ifndef _CRIS_PTRACE_H #define _CRIS_PTRACE_H -#include <asm/arch/ptrace.h> +#include <arch/ptrace.h> #ifdef __KERNEL__ diff --git a/include/asm-cris/resource.h b/arch/cris/include/asm/resource.h index b5d29448de4e..b5d29448de4e 100644 --- a/include/asm-cris/resource.h +++ b/arch/cris/include/asm/resource.h diff --git a/include/asm-cris/rs485.h b/arch/cris/include/asm/rs485.h index c331c51b0c2b..c331c51b0c2b 100644 --- a/include/asm-cris/rs485.h +++ b/arch/cris/include/asm/rs485.h diff --git a/include/asm-cris/rtc.h b/arch/cris/include/asm/rtc.h index 17d3019529e1..17d3019529e1 100644 --- a/include/asm-cris/rtc.h +++ b/arch/cris/include/asm/rtc.h diff --git a/include/asm-cris/scatterlist.h b/arch/cris/include/asm/scatterlist.h index faff53ad1f96..faff53ad1f96 100644 --- a/include/asm-cris/scatterlist.h +++ b/arch/cris/include/asm/scatterlist.h diff --git a/include/asm-cris/sections.h b/arch/cris/include/asm/sections.h index 2c998ce8967b..2c998ce8967b 100644 --- a/include/asm-cris/sections.h +++ b/arch/cris/include/asm/sections.h diff --git a/include/asm-cris/segment.h b/arch/cris/include/asm/segment.h index c067513beaaf..c067513beaaf 100644 --- a/include/asm-cris/segment.h +++ b/arch/cris/include/asm/segment.h diff --git a/include/asm-cris/sembuf.h b/arch/cris/include/asm/sembuf.h index 7fed9843796d..7fed9843796d 100644 --- a/include/asm-cris/sembuf.h +++ b/arch/cris/include/asm/sembuf.h diff --git a/include/asm-cris/setup.h b/arch/cris/include/asm/setup.h index b90728652d1a..b90728652d1a 100644 --- a/include/asm-cris/setup.h +++ b/arch/cris/include/asm/setup.h diff --git a/include/asm-cris/shmbuf.h b/arch/cris/include/asm/shmbuf.h index 3239e3f000e8..3239e3f000e8 100644 --- a/include/asm-cris/shmbuf.h +++ b/arch/cris/include/asm/shmbuf.h diff --git a/include/asm-cris/shmparam.h b/arch/cris/include/asm/shmparam.h index d29d12270687..d29d12270687 100644 --- a/include/asm-cris/shmparam.h +++ b/arch/cris/include/asm/shmparam.h diff --git a/include/asm-cris/sigcontext.h b/arch/cris/include/asm/sigcontext.h index a1d634e120df..a1d634e120df 100644 --- a/include/asm-cris/sigcontext.h +++ b/arch/cris/include/asm/sigcontext.h diff --git a/include/asm-cris/siginfo.h b/arch/cris/include/asm/siginfo.h index c1cd6d16928b..c1cd6d16928b 100644 --- a/include/asm-cris/siginfo.h +++ b/arch/cris/include/asm/siginfo.h diff --git a/include/asm-cris/signal.h b/arch/cris/include/asm/signal.h index 349ae682b568..349ae682b568 100644 --- a/include/asm-cris/signal.h +++ b/arch/cris/include/asm/signal.h diff --git a/include/asm-cris/smp.h b/arch/cris/include/asm/smp.h index dba33aba3e95..dba33aba3e95 100644 --- a/include/asm-cris/smp.h +++ b/arch/cris/include/asm/smp.h diff --git a/include/asm-cris/socket.h b/arch/cris/include/asm/socket.h index 9df0ca82f5de..9df0ca82f5de 100644 --- a/include/asm-cris/socket.h +++ b/arch/cris/include/asm/socket.h diff --git a/include/asm-cris/sockios.h b/arch/cris/include/asm/sockios.h index cfe7bfecf599..cfe7bfecf599 100644 --- a/include/asm-cris/sockios.h +++ b/arch/cris/include/asm/sockios.h diff --git a/arch/cris/include/asm/spinlock.h b/arch/cris/include/asm/spinlock.h new file mode 100644 index 000000000000..ed816b57face --- /dev/null +++ b/arch/cris/include/asm/spinlock.h @@ -0,0 +1 @@ +#include <arch/spinlock.h> diff --git a/include/asm-cris/stat.h b/arch/cris/include/asm/stat.h index 9e558cc3c43b..9e558cc3c43b 100644 --- a/include/asm-cris/stat.h +++ b/arch/cris/include/asm/stat.h diff --git a/include/asm-cris/statfs.h b/arch/cris/include/asm/statfs.h index fdaf921844bc..fdaf921844bc 100644 --- a/include/asm-cris/statfs.h +++ b/arch/cris/include/asm/statfs.h diff --git a/include/asm-cris/string.h b/arch/cris/include/asm/string.h index 691190e99a27..691190e99a27 100644 --- a/include/asm-cris/string.h +++ b/arch/cris/include/asm/string.h diff --git a/include/asm-cris/sync_serial.h b/arch/cris/include/asm/sync_serial.h index d87c24df2b38..d87c24df2b38 100644 --- a/include/asm-cris/sync_serial.h +++ b/arch/cris/include/asm/sync_serial.h diff --git a/include/asm-cris/system.h b/arch/cris/include/asm/system.h index 5bcfe5a10907..8657b084a922 100644 --- a/include/asm-cris/system.h +++ b/arch/cris/include/asm/system.h @@ -1,7 +1,7 @@ #ifndef __ASM_CRIS_SYSTEM_H #define __ASM_CRIS_SYSTEM_H -#include <asm/arch/system.h> +#include <arch/system.h> /* the switch_to macro calls resume, an asm function in entry.S which does the actual * task switching. diff --git a/include/asm-cris/termbits.h b/arch/cris/include/asm/termbits.h index 66e1a7492a0c..66e1a7492a0c 100644 --- a/include/asm-cris/termbits.h +++ b/arch/cris/include/asm/termbits.h diff --git a/include/asm-cris/termios.h b/arch/cris/include/asm/termios.h index b0124e6c2e41..b0124e6c2e41 100644 --- a/include/asm-cris/termios.h +++ b/arch/cris/include/asm/termios.h diff --git a/include/asm-cris/thread_info.h b/arch/cris/include/asm/thread_info.h index cee97f14af3b..bc5b2935ca53 100644 --- a/include/asm-cris/thread_info.h +++ b/arch/cris/include/asm/thread_info.h @@ -16,7 +16,7 @@ #ifndef __ASSEMBLY__ #include <asm/types.h> #include <asm/processor.h> -#include <asm/arch/thread_info.h> +#include <arch/thread_info.h> #include <asm/segment.h> #endif diff --git a/include/asm-cris/timex.h b/arch/cris/include/asm/timex.h index b92e0e80fe86..980924ae7518 100644 --- a/include/asm-cris/timex.h +++ b/arch/cris/include/asm/timex.h @@ -7,7 +7,7 @@ #ifndef _ASM_CRIS_TIMEX_H #define _ASM_CRIS_TIMEX_H -#include <asm/arch/timex.h> +#include <arch/timex.h> /* * We don't have a cycle-counter.. but we do not support SMP anyway where this is diff --git a/include/asm-cris/tlb.h b/arch/cris/include/asm/tlb.h index 7724246a2601..77384ea2f29d 100644 --- a/include/asm-cris/tlb.h +++ b/arch/cris/include/asm/tlb.h @@ -3,7 +3,7 @@ #include <linux/pagemap.h> -#include <asm/arch/tlb.h> +#include <arch/tlb.h> /* * cris doesn't need any special per-pte or diff --git a/include/asm-cris/tlbflush.h b/arch/cris/include/asm/tlbflush.h index 20697e7ef4f2..20697e7ef4f2 100644 --- a/include/asm-cris/tlbflush.h +++ b/arch/cris/include/asm/tlbflush.h diff --git a/include/asm-cris/topology.h b/arch/cris/include/asm/topology.h index 2ac613d32a89..2ac613d32a89 100644 --- a/include/asm-cris/topology.h +++ b/arch/cris/include/asm/topology.h diff --git a/include/asm-cris/types.h b/arch/cris/include/asm/types.h index 5790262cbe8a..5790262cbe8a 100644 --- a/include/asm-cris/types.h +++ b/arch/cris/include/asm/types.h diff --git a/include/asm-cris/uaccess.h b/arch/cris/include/asm/uaccess.h index ea11eaf0e922..914540801c5e 100644 --- a/include/asm-cris/uaccess.h +++ b/arch/cris/include/asm/uaccess.h @@ -54,7 +54,7 @@ #define __access_ok(addr,size) (__kernel_ok || __user_ok((addr),(size))) #define access_ok(type,addr,size) __access_ok((unsigned long)(addr),(size)) -#include <asm/arch/uaccess.h> +#include <arch/uaccess.h> /* * The exception table consists of pairs of addresses: the first is the diff --git a/include/asm-cris/ucontext.h b/arch/cris/include/asm/ucontext.h index eed6ad5eb3f2..eed6ad5eb3f2 100644 --- a/include/asm-cris/ucontext.h +++ b/arch/cris/include/asm/ucontext.h diff --git a/include/asm-cris/unaligned.h b/arch/cris/include/asm/unaligned.h index 7b3f3fec567c..7b3f3fec567c 100644 --- a/include/asm-cris/unaligned.h +++ b/arch/cris/include/asm/unaligned.h diff --git a/include/asm-cris/unistd.h b/arch/cris/include/asm/unistd.h index 76398ef87e9b..235d076379d5 100644 --- a/include/asm-cris/unistd.h +++ b/arch/cris/include/asm/unistd.h @@ -336,7 +336,7 @@ #define NR_syscalls 327 -#include <asm/arch/unistd.h> +#include <arch/unistd.h> #define __ARCH_WANT_IPC_PARSE_VERSION #define __ARCH_WANT_OLD_READDIR diff --git a/include/asm-cris/user.h b/arch/cris/include/asm/user.h index 73e60fcbcf38..59147cf43cf6 100644 --- a/include/asm-cris/user.h +++ b/arch/cris/include/asm/user.h @@ -4,7 +4,7 @@ #include <linux/types.h> #include <asm/ptrace.h> #include <asm/page.h> -#include <asm/arch/user.h> +#include <arch/user.h> /* * Core file format: The core file is written in such a way that gdb |