diff options
Diffstat (limited to '')
-rw-r--r-- | arch/xtensa/include/asm/Kbuild (renamed from include/asm-xtensa/Kbuild) | 0 | ||||
-rw-r--r-- | arch/xtensa/include/asm/asmmacro.h (renamed from include/asm-xtensa/asmmacro.h) | 2 | ||||
-rw-r--r-- | arch/xtensa/include/asm/atomic.h (renamed from include/asm-xtensa/atomic.h) | 0 | ||||
-rw-r--r-- | arch/xtensa/include/asm/auxvec.h (renamed from include/asm-xtensa/auxvec.h) | 0 | ||||
-rw-r--r-- | arch/xtensa/include/asm/bitops.h (renamed from include/asm-xtensa/bitops.h) | 0 | ||||
-rw-r--r-- | arch/xtensa/include/asm/bootparam.h (renamed from include/asm-xtensa/bootparam.h) | 0 | ||||
-rw-r--r-- | arch/xtensa/include/asm/bug.h (renamed from include/asm-xtensa/bug.h) | 0 | ||||
-rw-r--r-- | arch/xtensa/include/asm/bugs.h (renamed from include/asm-xtensa/bugs.h) | 0 | ||||
-rw-r--r-- | arch/xtensa/include/asm/byteorder.h (renamed from include/asm-xtensa/byteorder.h) | 0 | ||||
-rw-r--r-- | arch/xtensa/include/asm/cache.h (renamed from include/asm-xtensa/cache.h) | 2 | ||||
-rw-r--r-- | arch/xtensa/include/asm/cacheasm.h (renamed from include/asm-xtensa/cacheasm.h) | 0 | ||||
-rw-r--r-- | arch/xtensa/include/asm/cacheflush.h (renamed from include/asm-xtensa/cacheflush.h) | 0 | ||||
-rw-r--r-- | arch/xtensa/include/asm/checksum.h (renamed from include/asm-xtensa/checksum.h) | 2 | ||||
-rw-r--r-- | arch/xtensa/include/asm/coprocessor.h (renamed from include/asm-xtensa/coprocessor.h) | 4 | ||||
-rw-r--r-- | arch/xtensa/include/asm/cpumask.h (renamed from include/asm-xtensa/cpumask.h) | 0 | ||||
-rw-r--r-- | arch/xtensa/include/asm/cputime.h (renamed from include/asm-xtensa/cputime.h) | 0 | ||||
-rw-r--r-- | arch/xtensa/include/asm/current.h (renamed from include/asm-xtensa/current.h) | 0 | ||||
-rw-r--r-- | arch/xtensa/include/asm/delay.h (renamed from include/asm-xtensa/delay.h) | 0 | ||||
-rw-r--r-- | arch/xtensa/include/asm/device.h (renamed from include/asm-xtensa/device.h) | 0 | ||||
-rw-r--r-- | arch/xtensa/include/asm/div64.h (renamed from include/asm-xtensa/div64.h) | 0 | ||||
-rw-r--r-- | arch/xtensa/include/asm/dma-mapping.h (renamed from include/asm-xtensa/dma-mapping.h) | 0 | ||||
-rw-r--r-- | arch/xtensa/include/asm/dma.h (renamed from include/asm-xtensa/dma.h) | 0 | ||||
-rw-r--r-- | arch/xtensa/include/asm/elf.h (renamed from include/asm-xtensa/elf.h) | 0 | ||||
-rw-r--r-- | arch/xtensa/include/asm/emergency-restart.h (renamed from include/asm-xtensa/emergency-restart.h) | 0 | ||||
-rw-r--r-- | arch/xtensa/include/asm/errno.h (renamed from include/asm-xtensa/errno.h) | 0 | ||||
-rw-r--r-- | arch/xtensa/include/asm/fb.h (renamed from include/asm-xtensa/fb.h) | 0 | ||||
-rw-r--r-- | arch/xtensa/include/asm/fcntl.h (renamed from include/asm-xtensa/fcntl.h) | 0 | ||||
-rw-r--r-- | arch/xtensa/include/asm/futex.h (renamed from include/asm-xtensa/futex.h) | 0 | ||||
-rw-r--r-- | arch/xtensa/include/asm/hardirq.h (renamed from include/asm-xtensa/hardirq.h) | 0 | ||||
-rw-r--r-- | arch/xtensa/include/asm/highmem.h (renamed from include/asm-xtensa/highmem.h) | 0 | ||||
-rw-r--r-- | arch/xtensa/include/asm/hw_irq.h (renamed from include/asm-xtensa/hw_irq.h) | 0 | ||||
-rw-r--r-- | arch/xtensa/include/asm/io.h (renamed from include/asm-xtensa/io.h) | 0 | ||||
-rw-r--r-- | arch/xtensa/include/asm/ioctl.h (renamed from include/asm-xtensa/ioctl.h) | 0 | ||||
-rw-r--r-- | arch/xtensa/include/asm/ioctls.h (renamed from include/asm-xtensa/ioctls.h) | 0 | ||||
-rw-r--r-- | arch/xtensa/include/asm/ipcbuf.h (renamed from include/asm-xtensa/ipcbuf.h) | 0 | ||||
-rw-r--r-- | arch/xtensa/include/asm/irq.h (renamed from include/asm-xtensa/irq.h) | 4 | ||||
-rw-r--r-- | arch/xtensa/include/asm/irq_regs.h (renamed from include/asm-xtensa/irq_regs.h) | 0 | ||||
-rw-r--r-- | arch/xtensa/include/asm/kdebug.h (renamed from include/asm-xtensa/kdebug.h) | 0 | ||||
-rw-r--r-- | arch/xtensa/include/asm/kmap_types.h (renamed from include/asm-xtensa/kmap_types.h) | 0 | ||||
-rw-r--r-- | arch/xtensa/include/asm/linkage.h (renamed from include/asm-xtensa/linkage.h) | 0 | ||||
-rw-r--r-- | arch/xtensa/include/asm/local.h (renamed from include/asm-xtensa/local.h) | 0 | ||||
-rw-r--r-- | arch/xtensa/include/asm/mman.h (renamed from include/asm-xtensa/mman.h) | 0 | ||||
-rw-r--r-- | arch/xtensa/include/asm/mmu.h (renamed from include/asm-xtensa/mmu.h) | 0 | ||||
-rw-r--r-- | arch/xtensa/include/asm/mmu_context.h (renamed from include/asm-xtensa/mmu_context.h) | 0 | ||||
-rw-r--r-- | arch/xtensa/include/asm/module.h (renamed from include/asm-xtensa/module.h) | 0 | ||||
-rw-r--r-- | arch/xtensa/include/asm/msgbuf.h (renamed from include/asm-xtensa/msgbuf.h) | 0 | ||||
-rw-r--r-- | arch/xtensa/include/asm/mutex.h (renamed from include/asm-xtensa/mutex.h) | 0 | ||||
-rw-r--r-- | arch/xtensa/include/asm/page.h (renamed from include/asm-xtensa/page.h) | 0 | ||||
-rw-r--r-- | arch/xtensa/include/asm/param.h (renamed from include/asm-xtensa/param.h) | 0 | ||||
-rw-r--r-- | arch/xtensa/include/asm/pci-bridge.h (renamed from include/asm-xtensa/pci-bridge.h) | 0 | ||||
-rw-r--r-- | arch/xtensa/include/asm/pci.h (renamed from include/asm-xtensa/pci.h) | 0 | ||||
-rw-r--r-- | arch/xtensa/include/asm/percpu.h (renamed from include/asm-xtensa/percpu.h) | 0 | ||||
-rw-r--r-- | arch/xtensa/include/asm/pgalloc.h (renamed from include/asm-xtensa/pgalloc.h) | 0 | ||||
-rw-r--r-- | arch/xtensa/include/asm/pgtable.h (renamed from include/asm-xtensa/pgtable.h) | 0 | ||||
-rw-r--r-- | arch/xtensa/include/asm/platform.h (renamed from include/asm-xtensa/platform.h) | 2 | ||||
-rw-r--r-- | arch/xtensa/include/asm/poll.h (renamed from include/asm-xtensa/poll.h) | 0 | ||||
-rw-r--r-- | arch/xtensa/include/asm/posix_types.h (renamed from include/asm-xtensa/posix_types.h) | 0 | ||||
-rw-r--r-- | arch/xtensa/include/asm/processor.h (renamed from include/asm-xtensa/processor.h) | 2 | ||||
-rw-r--r-- | arch/xtensa/include/asm/ptrace.h (renamed from include/asm-xtensa/ptrace.h) | 2 | ||||
-rw-r--r-- | arch/xtensa/include/asm/regs.h (renamed from include/asm-xtensa/regs.h) | 0 | ||||
-rw-r--r-- | arch/xtensa/include/asm/resource.h (renamed from include/asm-xtensa/resource.h) | 0 | ||||
-rw-r--r-- | arch/xtensa/include/asm/rmap.h (renamed from include/asm-xtensa/rmap.h) | 0 | ||||
-rw-r--r-- | arch/xtensa/include/asm/rwsem.h (renamed from include/asm-xtensa/rwsem.h) | 0 | ||||
-rw-r--r-- | arch/xtensa/include/asm/scatterlist.h (renamed from include/asm-xtensa/scatterlist.h) | 0 | ||||
-rw-r--r-- | arch/xtensa/include/asm/sections.h (renamed from include/asm-xtensa/sections.h) | 0 | ||||
-rw-r--r-- | arch/xtensa/include/asm/segment.h (renamed from include/asm-xtensa/segment.h) | 0 | ||||
-rw-r--r-- | arch/xtensa/include/asm/sembuf.h (renamed from include/asm-xtensa/sembuf.h) | 0 | ||||
-rw-r--r-- | arch/xtensa/include/asm/serial.h (renamed from include/asm-xtensa/serial.h) | 2 | ||||
-rw-r--r-- | arch/xtensa/include/asm/setup.h (renamed from include/asm-xtensa/setup.h) | 0 | ||||
-rw-r--r-- | arch/xtensa/include/asm/shmbuf.h (renamed from include/asm-xtensa/shmbuf.h) | 0 | ||||
-rw-r--r-- | arch/xtensa/include/asm/shmparam.h (renamed from include/asm-xtensa/shmparam.h) | 0 | ||||
-rw-r--r-- | arch/xtensa/include/asm/sigcontext.h (renamed from include/asm-xtensa/sigcontext.h) | 0 | ||||
-rw-r--r-- | arch/xtensa/include/asm/siginfo.h (renamed from include/asm-xtensa/siginfo.h) | 0 | ||||
-rw-r--r-- | arch/xtensa/include/asm/signal.h (renamed from include/asm-xtensa/signal.h) | 0 | ||||
-rw-r--r-- | arch/xtensa/include/asm/smp.h (renamed from include/asm-xtensa/smp.h) | 0 | ||||
-rw-r--r-- | arch/xtensa/include/asm/socket.h (renamed from include/asm-xtensa/socket.h) | 0 | ||||
-rw-r--r-- | arch/xtensa/include/asm/sockios.h (renamed from include/asm-xtensa/sockios.h) | 0 | ||||
-rw-r--r-- | arch/xtensa/include/asm/spinlock.h (renamed from include/asm-xtensa/spinlock.h) | 0 | ||||
-rw-r--r-- | arch/xtensa/include/asm/stat.h (renamed from include/asm-xtensa/stat.h) | 0 | ||||
-rw-r--r-- | arch/xtensa/include/asm/statfs.h (renamed from include/asm-xtensa/statfs.h) | 0 | ||||
-rw-r--r-- | arch/xtensa/include/asm/string.h (renamed from include/asm-xtensa/string.h) | 0 | ||||
-rw-r--r-- | arch/xtensa/include/asm/syscall.h (renamed from include/asm-xtensa/syscall.h) | 0 | ||||
-rw-r--r-- | arch/xtensa/include/asm/system.h (renamed from include/asm-xtensa/system.h) | 0 | ||||
-rw-r--r-- | arch/xtensa/include/asm/termbits.h (renamed from include/asm-xtensa/termbits.h) | 0 | ||||
-rw-r--r-- | arch/xtensa/include/asm/termios.h (renamed from include/asm-xtensa/termios.h) | 0 | ||||
-rw-r--r-- | arch/xtensa/include/asm/thread_info.h (renamed from include/asm-xtensa/thread_info.h) | 0 | ||||
-rw-r--r-- | arch/xtensa/include/asm/timex.h (renamed from include/asm-xtensa/timex.h) | 0 | ||||
-rw-r--r-- | arch/xtensa/include/asm/tlb.h (renamed from include/asm-xtensa/tlb.h) | 0 | ||||
-rw-r--r-- | arch/xtensa/include/asm/tlbflush.h (renamed from include/asm-xtensa/tlbflush.h) | 0 | ||||
-rw-r--r-- | arch/xtensa/include/asm/topology.h (renamed from include/asm-xtensa/topology.h) | 0 | ||||
-rw-r--r-- | arch/xtensa/include/asm/types.h (renamed from include/asm-xtensa/types.h) | 0 | ||||
-rw-r--r-- | arch/xtensa/include/asm/uaccess.h (renamed from include/asm-xtensa/uaccess.h) | 0 | ||||
-rw-r--r-- | arch/xtensa/include/asm/ucontext.h (renamed from include/asm-xtensa/ucontext.h) | 0 | ||||
-rw-r--r-- | arch/xtensa/include/asm/unaligned.h (renamed from include/asm-xtensa/unaligned.h) | 0 | ||||
-rw-r--r-- | arch/xtensa/include/asm/unistd.h (renamed from include/asm-xtensa/unistd.h) | 0 | ||||
-rw-r--r-- | arch/xtensa/include/asm/user.h (renamed from include/asm-xtensa/user.h) | 0 | ||||
-rw-r--r-- | arch/xtensa/include/asm/vga.h (renamed from include/asm-xtensa/vga.h) | 0 | ||||
-rw-r--r-- | arch/xtensa/include/asm/xor.h (renamed from include/asm-xtensa/xor.h) | 0 |
98 files changed, 10 insertions, 12 deletions
diff --git a/include/asm-xtensa/Kbuild b/arch/xtensa/include/asm/Kbuild index c68e1680da01..c68e1680da01 100644 --- a/include/asm-xtensa/Kbuild +++ b/arch/xtensa/include/asm/Kbuild diff --git a/include/asm-xtensa/asmmacro.h b/arch/xtensa/include/asm/asmmacro.h index 76915cabad17..755320f6e0bc 100644 --- a/include/asm-xtensa/asmmacro.h +++ b/arch/xtensa/include/asm/asmmacro.h @@ -11,7 +11,7 @@ #ifndef _XTENSA_ASMMACRO_H #define _XTENSA_ASMMACRO_H -#include <asm/variant/core.h> +#include <variant/core.h> /* * Some little helpers for loops. Use zero-overhead-loops diff --git a/include/asm-xtensa/atomic.h b/arch/xtensa/include/asm/atomic.h index b3b23540f14d..b3b23540f14d 100644 --- a/include/asm-xtensa/atomic.h +++ b/arch/xtensa/include/asm/atomic.h diff --git a/include/asm-xtensa/auxvec.h b/arch/xtensa/include/asm/auxvec.h index 257dec75c5af..257dec75c5af 100644 --- a/include/asm-xtensa/auxvec.h +++ b/arch/xtensa/include/asm/auxvec.h diff --git a/include/asm-xtensa/bitops.h b/arch/xtensa/include/asm/bitops.h index 23261e8f2e5a..23261e8f2e5a 100644 --- a/include/asm-xtensa/bitops.h +++ b/arch/xtensa/include/asm/bitops.h diff --git a/include/asm-xtensa/bootparam.h b/arch/xtensa/include/asm/bootparam.h index 9983f2c1b7ee..9983f2c1b7ee 100644 --- a/include/asm-xtensa/bootparam.h +++ b/arch/xtensa/include/asm/bootparam.h diff --git a/include/asm-xtensa/bug.h b/arch/xtensa/include/asm/bug.h index 3e52d72712f1..3e52d72712f1 100644 --- a/include/asm-xtensa/bug.h +++ b/arch/xtensa/include/asm/bug.h diff --git a/include/asm-xtensa/bugs.h b/arch/xtensa/include/asm/bugs.h index 69b29d198249..69b29d198249 100644 --- a/include/asm-xtensa/bugs.h +++ b/arch/xtensa/include/asm/bugs.h diff --git a/include/asm-xtensa/byteorder.h b/arch/xtensa/include/asm/byteorder.h index 07d10ad364d1..07d10ad364d1 100644 --- a/include/asm-xtensa/byteorder.h +++ b/arch/xtensa/include/asm/byteorder.h diff --git a/include/asm-xtensa/cache.h b/arch/xtensa/include/asm/cache.h index 3bba2a540cf0..f04c9891142f 100644 --- a/include/asm-xtensa/cache.h +++ b/arch/xtensa/include/asm/cache.h @@ -11,7 +11,7 @@ #ifndef _XTENSA_CACHE_H #define _XTENSA_CACHE_H -#include <asm/variant/core.h> +#include <variant/core.h> #define L1_CACHE_SHIFT XCHAL_DCACHE_LINEWIDTH #define L1_CACHE_BYTES XCHAL_DCACHE_LINESIZE diff --git a/include/asm-xtensa/cacheasm.h b/arch/xtensa/include/asm/cacheasm.h index 2c20a58f94cd..2c20a58f94cd 100644 --- a/include/asm-xtensa/cacheasm.h +++ b/arch/xtensa/include/asm/cacheasm.h diff --git a/include/asm-xtensa/cacheflush.h b/arch/xtensa/include/asm/cacheflush.h index 94c4c53a099e..94c4c53a099e 100644 --- a/include/asm-xtensa/cacheflush.h +++ b/arch/xtensa/include/asm/cacheflush.h diff --git a/include/asm-xtensa/checksum.h b/arch/xtensa/include/asm/checksum.h index 23534c60b3a4..f84d3f00774a 100644 --- a/include/asm-xtensa/checksum.h +++ b/arch/xtensa/include/asm/checksum.h @@ -12,7 +12,7 @@ #define _XTENSA_CHECKSUM_H #include <linux/in6.h> -#include <asm/variant/core.h> +#include <variant/core.h> /* * computes the checksum of a memory block at buff, length len, diff --git a/include/asm-xtensa/coprocessor.h b/arch/xtensa/include/asm/coprocessor.h index 1cbcf9001a41..65a285d8d3fb 100644 --- a/include/asm-xtensa/coprocessor.h +++ b/arch/xtensa/include/asm/coprocessor.h @@ -13,11 +13,11 @@ #define _XTENSA_COPROCESSOR_H #include <linux/stringify.h> -#include <asm/variant/tie.h> +#include <variant/tie.h> #include <asm/types.h> #ifdef __ASSEMBLY__ -# include <asm/variant/tie-asm.h> +# include <variant/tie-asm.h> .macro xchal_sa_start a b .set .Lxchal_pofs_, 0 diff --git a/include/asm-xtensa/cpumask.h b/arch/xtensa/include/asm/cpumask.h index ebeede397db3..ebeede397db3 100644 --- a/include/asm-xtensa/cpumask.h +++ b/arch/xtensa/include/asm/cpumask.h diff --git a/include/asm-xtensa/cputime.h b/arch/xtensa/include/asm/cputime.h index a7fb864a50ae..a7fb864a50ae 100644 --- a/include/asm-xtensa/cputime.h +++ b/arch/xtensa/include/asm/cputime.h diff --git a/include/asm-xtensa/current.h b/arch/xtensa/include/asm/current.h index 8d1eb5d78649..8d1eb5d78649 100644 --- a/include/asm-xtensa/current.h +++ b/arch/xtensa/include/asm/current.h diff --git a/include/asm-xtensa/delay.h b/arch/xtensa/include/asm/delay.h index e1d8c9e010c1..e1d8c9e010c1 100644 --- a/include/asm-xtensa/delay.h +++ b/arch/xtensa/include/asm/delay.h diff --git a/include/asm-xtensa/device.h b/arch/xtensa/include/asm/device.h index d8f9872b0e2d..d8f9872b0e2d 100644 --- a/include/asm-xtensa/device.h +++ b/arch/xtensa/include/asm/device.h diff --git a/include/asm-xtensa/div64.h b/arch/xtensa/include/asm/div64.h index f35678cb0a9b..f35678cb0a9b 100644 --- a/include/asm-xtensa/div64.h +++ b/arch/xtensa/include/asm/div64.h diff --git a/include/asm-xtensa/dma-mapping.h b/arch/xtensa/include/asm/dma-mapping.h index 51882ae3db4d..51882ae3db4d 100644 --- a/include/asm-xtensa/dma-mapping.h +++ b/arch/xtensa/include/asm/dma-mapping.h diff --git a/include/asm-xtensa/dma.h b/arch/xtensa/include/asm/dma.h index e30f3abf48f0..e30f3abf48f0 100644 --- a/include/asm-xtensa/dma.h +++ b/arch/xtensa/include/asm/dma.h diff --git a/include/asm-xtensa/elf.h b/arch/xtensa/include/asm/elf.h index c3f53e755ca5..c3f53e755ca5 100644 --- a/include/asm-xtensa/elf.h +++ b/arch/xtensa/include/asm/elf.h diff --git a/include/asm-xtensa/emergency-restart.h b/arch/xtensa/include/asm/emergency-restart.h index 108d8c48e42e..108d8c48e42e 100644 --- a/include/asm-xtensa/emergency-restart.h +++ b/arch/xtensa/include/asm/emergency-restart.h diff --git a/include/asm-xtensa/errno.h b/arch/xtensa/include/asm/errno.h index a0f3b96b79b4..a0f3b96b79b4 100644 --- a/include/asm-xtensa/errno.h +++ b/arch/xtensa/include/asm/errno.h diff --git a/include/asm-xtensa/fb.h b/arch/xtensa/include/asm/fb.h index c7df38030992..c7df38030992 100644 --- a/include/asm-xtensa/fb.h +++ b/arch/xtensa/include/asm/fb.h diff --git a/include/asm-xtensa/fcntl.h b/arch/xtensa/include/asm/fcntl.h index 46ab12db5739..46ab12db5739 100644 --- a/include/asm-xtensa/fcntl.h +++ b/arch/xtensa/include/asm/fcntl.h diff --git a/include/asm-xtensa/futex.h b/arch/xtensa/include/asm/futex.h index 0b745828f42b..0b745828f42b 100644 --- a/include/asm-xtensa/futex.h +++ b/arch/xtensa/include/asm/futex.h diff --git a/include/asm-xtensa/hardirq.h b/arch/xtensa/include/asm/hardirq.h index 87cb19d1b10c..87cb19d1b10c 100644 --- a/include/asm-xtensa/hardirq.h +++ b/arch/xtensa/include/asm/hardirq.h diff --git a/include/asm-xtensa/highmem.h b/arch/xtensa/include/asm/highmem.h index 0a046ca5a687..0a046ca5a687 100644 --- a/include/asm-xtensa/highmem.h +++ b/arch/xtensa/include/asm/highmem.h diff --git a/include/asm-xtensa/hw_irq.h b/arch/xtensa/include/asm/hw_irq.h index 3ddbea759b2b..3ddbea759b2b 100644 --- a/include/asm-xtensa/hw_irq.h +++ b/arch/xtensa/include/asm/hw_irq.h diff --git a/include/asm-xtensa/io.h b/arch/xtensa/include/asm/io.h index 07b7299dab20..07b7299dab20 100644 --- a/include/asm-xtensa/io.h +++ b/arch/xtensa/include/asm/io.h diff --git a/include/asm-xtensa/ioctl.h b/arch/xtensa/include/asm/ioctl.h index b279fe06dfe5..b279fe06dfe5 100644 --- a/include/asm-xtensa/ioctl.h +++ b/arch/xtensa/include/asm/ioctl.h diff --git a/include/asm-xtensa/ioctls.h b/arch/xtensa/include/asm/ioctls.h index 0ffa942954b9..0ffa942954b9 100644 --- a/include/asm-xtensa/ioctls.h +++ b/arch/xtensa/include/asm/ioctls.h diff --git a/include/asm-xtensa/ipcbuf.h b/arch/xtensa/include/asm/ipcbuf.h index c33aa6a42145..c33aa6a42145 100644 --- a/include/asm-xtensa/ipcbuf.h +++ b/arch/xtensa/include/asm/ipcbuf.h diff --git a/include/asm-xtensa/irq.h b/arch/xtensa/include/asm/irq.h index fc73b7f11aff..1620d1e0e695 100644 --- a/include/asm-xtensa/irq.h +++ b/arch/xtensa/include/asm/irq.h @@ -11,8 +11,8 @@ #ifndef _XTENSA_IRQ_H #define _XTENSA_IRQ_H -#include <asm/platform/hardware.h> -#include <asm/variant/core.h> +#include <platform/hardware.h> +#include <variant/core.h> #ifndef PLATFORM_NR_IRQS # define PLATFORM_NR_IRQS 0 diff --git a/include/asm-xtensa/irq_regs.h b/arch/xtensa/include/asm/irq_regs.h index 3dd9c0b70270..3dd9c0b70270 100644 --- a/include/asm-xtensa/irq_regs.h +++ b/arch/xtensa/include/asm/irq_regs.h diff --git a/include/asm-xtensa/kdebug.h b/arch/xtensa/include/asm/kdebug.h index 6ece1b037665..6ece1b037665 100644 --- a/include/asm-xtensa/kdebug.h +++ b/arch/xtensa/include/asm/kdebug.h diff --git a/include/asm-xtensa/kmap_types.h b/arch/xtensa/include/asm/kmap_types.h index 9e822d2e3bce..9e822d2e3bce 100644 --- a/include/asm-xtensa/kmap_types.h +++ b/arch/xtensa/include/asm/kmap_types.h diff --git a/include/asm-xtensa/linkage.h b/arch/xtensa/include/asm/linkage.h index bf2128a99d79..bf2128a99d79 100644 --- a/include/asm-xtensa/linkage.h +++ b/arch/xtensa/include/asm/linkage.h diff --git a/include/asm-xtensa/local.h b/arch/xtensa/include/asm/local.h index 48723e550d14..48723e550d14 100644 --- a/include/asm-xtensa/local.h +++ b/arch/xtensa/include/asm/local.h diff --git a/include/asm-xtensa/mman.h b/arch/xtensa/include/asm/mman.h index 9b92620c8a1e..9b92620c8a1e 100644 --- a/include/asm-xtensa/mman.h +++ b/arch/xtensa/include/asm/mman.h diff --git a/include/asm-xtensa/mmu.h b/arch/xtensa/include/asm/mmu.h index 44c5bb04c55c..44c5bb04c55c 100644 --- a/include/asm-xtensa/mmu.h +++ b/arch/xtensa/include/asm/mmu.h diff --git a/include/asm-xtensa/mmu_context.h b/arch/xtensa/include/asm/mmu_context.h index c0fd8e5b4513..c0fd8e5b4513 100644 --- a/include/asm-xtensa/mmu_context.h +++ b/arch/xtensa/include/asm/mmu_context.h diff --git a/include/asm-xtensa/module.h b/arch/xtensa/include/asm/module.h index d9b34bee4d42..d9b34bee4d42 100644 --- a/include/asm-xtensa/module.h +++ b/arch/xtensa/include/asm/module.h diff --git a/include/asm-xtensa/msgbuf.h b/arch/xtensa/include/asm/msgbuf.h index 693c96755280..693c96755280 100644 --- a/include/asm-xtensa/msgbuf.h +++ b/arch/xtensa/include/asm/msgbuf.h diff --git a/include/asm-xtensa/mutex.h b/arch/xtensa/include/asm/mutex.h index 458c1f7fbc18..458c1f7fbc18 100644 --- a/include/asm-xtensa/mutex.h +++ b/arch/xtensa/include/asm/mutex.h diff --git a/include/asm-xtensa/page.h b/arch/xtensa/include/asm/page.h index 11f7dc2dbec7..11f7dc2dbec7 100644 --- a/include/asm-xtensa/page.h +++ b/arch/xtensa/include/asm/page.h diff --git a/include/asm-xtensa/param.h b/arch/xtensa/include/asm/param.h index ba03d5aeab6b..ba03d5aeab6b 100644 --- a/include/asm-xtensa/param.h +++ b/arch/xtensa/include/asm/param.h diff --git a/include/asm-xtensa/pci-bridge.h b/arch/xtensa/include/asm/pci-bridge.h index 00fcbd7c534a..00fcbd7c534a 100644 --- a/include/asm-xtensa/pci-bridge.h +++ b/arch/xtensa/include/asm/pci-bridge.h diff --git a/include/asm-xtensa/pci.h b/arch/xtensa/include/asm/pci.h index 66410acf18b4..66410acf18b4 100644 --- a/include/asm-xtensa/pci.h +++ b/arch/xtensa/include/asm/pci.h diff --git a/include/asm-xtensa/percpu.h b/arch/xtensa/include/asm/percpu.h index 6d2bc2ada9d1..6d2bc2ada9d1 100644 --- a/include/asm-xtensa/percpu.h +++ b/arch/xtensa/include/asm/percpu.h diff --git a/include/asm-xtensa/pgalloc.h b/arch/xtensa/include/asm/pgalloc.h index 4f4a7987eded..4f4a7987eded 100644 --- a/include/asm-xtensa/pgalloc.h +++ b/arch/xtensa/include/asm/pgalloc.h diff --git a/include/asm-xtensa/pgtable.h b/arch/xtensa/include/asm/pgtable.h index 8014d96b21f1..8014d96b21f1 100644 --- a/include/asm-xtensa/pgtable.h +++ b/arch/xtensa/include/asm/pgtable.h diff --git a/include/asm-xtensa/platform.h b/arch/xtensa/include/asm/platform.h index 48135a9718b0..e3d5a48ad495 100644 --- a/include/asm-xtensa/platform.h +++ b/arch/xtensa/include/asm/platform.h @@ -1,6 +1,4 @@ /* - * include/asm-xtensa/platform.h - * * Platform specific functions * * This file is subject to the terms and conditions of the GNU General diff --git a/include/asm-xtensa/poll.h b/arch/xtensa/include/asm/poll.h index 9d2d5993f068..9d2d5993f068 100644 --- a/include/asm-xtensa/poll.h +++ b/arch/xtensa/include/asm/poll.h diff --git a/include/asm-xtensa/posix_types.h b/arch/xtensa/include/asm/posix_types.h index 43f9dd1126a4..43f9dd1126a4 100644 --- a/include/asm-xtensa/posix_types.h +++ b/arch/xtensa/include/asm/posix_types.h diff --git a/include/asm-xtensa/processor.h b/arch/xtensa/include/asm/processor.h index 4918a4e96d42..07387d3b99f4 100644 --- a/include/asm-xtensa/processor.h +++ b/arch/xtensa/include/asm/processor.h @@ -11,7 +11,7 @@ #ifndef _XTENSA_PROCESSOR_H #define _XTENSA_PROCESSOR_H -#include <asm/variant/core.h> +#include <variant/core.h> #include <asm/coprocessor.h> #include <linux/compiler.h> diff --git a/include/asm-xtensa/ptrace.h b/arch/xtensa/include/asm/ptrace.h index 089b0db44816..905e1e619654 100644 --- a/include/asm-xtensa/ptrace.h +++ b/arch/xtensa/include/asm/ptrace.h @@ -111,7 +111,7 @@ struct pt_regs { unsigned long areg[16]; /* 128 (64) */ }; -#include <asm/variant/core.h> +#include <variant/core.h> # define task_pt_regs(tsk) ((struct pt_regs*) \ (task_stack_page(tsk) + KERNEL_STACK_SIZE - (XCHAL_NUM_AREGS-16)*4) - 1) diff --git a/include/asm-xtensa/regs.h b/arch/xtensa/include/asm/regs.h index d4baed246928..d4baed246928 100644 --- a/include/asm-xtensa/regs.h +++ b/arch/xtensa/include/asm/regs.h diff --git a/include/asm-xtensa/resource.h b/arch/xtensa/include/asm/resource.h index 17b5ab311771..17b5ab311771 100644 --- a/include/asm-xtensa/resource.h +++ b/arch/xtensa/include/asm/resource.h diff --git a/include/asm-xtensa/rmap.h b/arch/xtensa/include/asm/rmap.h index 649588b7e9ad..649588b7e9ad 100644 --- a/include/asm-xtensa/rmap.h +++ b/arch/xtensa/include/asm/rmap.h diff --git a/include/asm-xtensa/rwsem.h b/arch/xtensa/include/asm/rwsem.h index e39edf5c86f2..e39edf5c86f2 100644 --- a/include/asm-xtensa/rwsem.h +++ b/arch/xtensa/include/asm/rwsem.h diff --git a/include/asm-xtensa/scatterlist.h b/arch/xtensa/include/asm/scatterlist.h index 810080bb0a2b..810080bb0a2b 100644 --- a/include/asm-xtensa/scatterlist.h +++ b/arch/xtensa/include/asm/scatterlist.h diff --git a/include/asm-xtensa/sections.h b/arch/xtensa/include/asm/sections.h index 40b5191b55a2..40b5191b55a2 100644 --- a/include/asm-xtensa/sections.h +++ b/arch/xtensa/include/asm/sections.h diff --git a/include/asm-xtensa/segment.h b/arch/xtensa/include/asm/segment.h index a2eb547a1a75..a2eb547a1a75 100644 --- a/include/asm-xtensa/segment.h +++ b/arch/xtensa/include/asm/segment.h diff --git a/include/asm-xtensa/sembuf.h b/arch/xtensa/include/asm/sembuf.h index c15870493b33..c15870493b33 100644 --- a/include/asm-xtensa/sembuf.h +++ b/arch/xtensa/include/asm/sembuf.h diff --git a/include/asm-xtensa/serial.h b/arch/xtensa/include/asm/serial.h index ec04114fcf0b..a8a2493260f6 100644 --- a/include/asm-xtensa/serial.h +++ b/arch/xtensa/include/asm/serial.h @@ -13,6 +13,6 @@ #ifndef _XTENSA_SERIAL_H #define _XTENSA_SERIAL_H -#include <asm/platform/serial.h> +#include <platform/serial.h> #endif /* _XTENSA_SERIAL_H */ diff --git a/include/asm-xtensa/setup.h b/arch/xtensa/include/asm/setup.h index e3636520d8cc..e3636520d8cc 100644 --- a/include/asm-xtensa/setup.h +++ b/arch/xtensa/include/asm/setup.h diff --git a/include/asm-xtensa/shmbuf.h b/arch/xtensa/include/asm/shmbuf.h index ad4b0121782c..ad4b0121782c 100644 --- a/include/asm-xtensa/shmbuf.h +++ b/arch/xtensa/include/asm/shmbuf.h diff --git a/include/asm-xtensa/shmparam.h b/arch/xtensa/include/asm/shmparam.h index c8cc16c3da9e..c8cc16c3da9e 100644 --- a/include/asm-xtensa/shmparam.h +++ b/arch/xtensa/include/asm/shmparam.h diff --git a/include/asm-xtensa/sigcontext.h b/arch/xtensa/include/asm/sigcontext.h index 03383af8c3b7..03383af8c3b7 100644 --- a/include/asm-xtensa/sigcontext.h +++ b/arch/xtensa/include/asm/sigcontext.h diff --git a/include/asm-xtensa/siginfo.h b/arch/xtensa/include/asm/siginfo.h index 6916248295df..6916248295df 100644 --- a/include/asm-xtensa/siginfo.h +++ b/arch/xtensa/include/asm/siginfo.h diff --git a/include/asm-xtensa/signal.h b/arch/xtensa/include/asm/signal.h index 633ba73bc4d2..633ba73bc4d2 100644 --- a/include/asm-xtensa/signal.h +++ b/arch/xtensa/include/asm/signal.h diff --git a/include/asm-xtensa/smp.h b/arch/xtensa/include/asm/smp.h index 83c569e3bdbd..83c569e3bdbd 100644 --- a/include/asm-xtensa/smp.h +++ b/arch/xtensa/include/asm/smp.h diff --git a/include/asm-xtensa/socket.h b/arch/xtensa/include/asm/socket.h index 6100682b1da2..6100682b1da2 100644 --- a/include/asm-xtensa/socket.h +++ b/arch/xtensa/include/asm/socket.h diff --git a/include/asm-xtensa/sockios.h b/arch/xtensa/include/asm/sockios.h index efe0af379f01..efe0af379f01 100644 --- a/include/asm-xtensa/sockios.h +++ b/arch/xtensa/include/asm/sockios.h diff --git a/include/asm-xtensa/spinlock.h b/arch/xtensa/include/asm/spinlock.h index 8ff23649581b..8ff23649581b 100644 --- a/include/asm-xtensa/spinlock.h +++ b/arch/xtensa/include/asm/spinlock.h diff --git a/include/asm-xtensa/stat.h b/arch/xtensa/include/asm/stat.h index c4992038cee0..c4992038cee0 100644 --- a/include/asm-xtensa/stat.h +++ b/arch/xtensa/include/asm/stat.h diff --git a/include/asm-xtensa/statfs.h b/arch/xtensa/include/asm/statfs.h index 9c3d1a213136..9c3d1a213136 100644 --- a/include/asm-xtensa/statfs.h +++ b/arch/xtensa/include/asm/statfs.h diff --git a/include/asm-xtensa/string.h b/arch/xtensa/include/asm/string.h index 5fb8c27cbef5..5fb8c27cbef5 100644 --- a/include/asm-xtensa/string.h +++ b/arch/xtensa/include/asm/string.h diff --git a/include/asm-xtensa/syscall.h b/arch/xtensa/include/asm/syscall.h index 05cebf8f62b1..05cebf8f62b1 100644 --- a/include/asm-xtensa/syscall.h +++ b/arch/xtensa/include/asm/syscall.h diff --git a/include/asm-xtensa/system.h b/arch/xtensa/include/asm/system.h index 62b1e8f3c13c..62b1e8f3c13c 100644 --- a/include/asm-xtensa/system.h +++ b/arch/xtensa/include/asm/system.h diff --git a/include/asm-xtensa/termbits.h b/arch/xtensa/include/asm/termbits.h index 85aa6a3c0b6e..85aa6a3c0b6e 100644 --- a/include/asm-xtensa/termbits.h +++ b/arch/xtensa/include/asm/termbits.h diff --git a/include/asm-xtensa/termios.h b/arch/xtensa/include/asm/termios.h index 4673f42f88a7..4673f42f88a7 100644 --- a/include/asm-xtensa/termios.h +++ b/arch/xtensa/include/asm/termios.h diff --git a/include/asm-xtensa/thread_info.h b/arch/xtensa/include/asm/thread_info.h index 0f4fe1faf9ba..0f4fe1faf9ba 100644 --- a/include/asm-xtensa/thread_info.h +++ b/arch/xtensa/include/asm/thread_info.h diff --git a/include/asm-xtensa/timex.h b/arch/xtensa/include/asm/timex.h index b83a8181d448..b83a8181d448 100644 --- a/include/asm-xtensa/timex.h +++ b/arch/xtensa/include/asm/timex.h diff --git a/include/asm-xtensa/tlb.h b/arch/xtensa/include/asm/tlb.h index 31c220faca02..31c220faca02 100644 --- a/include/asm-xtensa/tlb.h +++ b/arch/xtensa/include/asm/tlb.h diff --git a/include/asm-xtensa/tlbflush.h b/arch/xtensa/include/asm/tlbflush.h index 46d240074f74..46d240074f74 100644 --- a/include/asm-xtensa/tlbflush.h +++ b/arch/xtensa/include/asm/tlbflush.h diff --git a/include/asm-xtensa/topology.h b/arch/xtensa/include/asm/topology.h index 7309e38a0ccb..7309e38a0ccb 100644 --- a/include/asm-xtensa/topology.h +++ b/arch/xtensa/include/asm/topology.h diff --git a/include/asm-xtensa/types.h b/arch/xtensa/include/asm/types.h index c89569a8da0c..c89569a8da0c 100644 --- a/include/asm-xtensa/types.h +++ b/arch/xtensa/include/asm/types.h diff --git a/include/asm-xtensa/uaccess.h b/arch/xtensa/include/asm/uaccess.h index b8528426ab1f..b8528426ab1f 100644 --- a/include/asm-xtensa/uaccess.h +++ b/arch/xtensa/include/asm/uaccess.h diff --git a/include/asm-xtensa/ucontext.h b/arch/xtensa/include/asm/ucontext.h index 94c94ed3e00a..94c94ed3e00a 100644 --- a/include/asm-xtensa/ucontext.h +++ b/arch/xtensa/include/asm/ucontext.h diff --git a/include/asm-xtensa/unaligned.h b/arch/xtensa/include/asm/unaligned.h index 8f3424fc5d18..8f3424fc5d18 100644 --- a/include/asm-xtensa/unaligned.h +++ b/arch/xtensa/include/asm/unaligned.h diff --git a/include/asm-xtensa/unistd.h b/arch/xtensa/include/asm/unistd.h index c092c8fbb2cf..c092c8fbb2cf 100644 --- a/include/asm-xtensa/unistd.h +++ b/arch/xtensa/include/asm/unistd.h diff --git a/include/asm-xtensa/user.h b/arch/xtensa/include/asm/user.h index 2c3ed23354a8..2c3ed23354a8 100644 --- a/include/asm-xtensa/user.h +++ b/arch/xtensa/include/asm/user.h diff --git a/include/asm-xtensa/vga.h b/arch/xtensa/include/asm/vga.h index 1fd8cab3a297..1fd8cab3a297 100644 --- a/include/asm-xtensa/vga.h +++ b/arch/xtensa/include/asm/vga.h diff --git a/include/asm-xtensa/xor.h b/arch/xtensa/include/asm/xor.h index e7b1f083991d..e7b1f083991d 100644 --- a/include/asm-xtensa/xor.h +++ b/arch/xtensa/include/asm/xor.h |