From da7616610c8d2ec16a8ada44216e836e5fcbd08b Mon Sep 17 00:00:00 2001 From: David Howells Date: Fri, 10 Apr 2009 14:19:03 +0100 Subject: [PATCH] Move arch headers from include/asm-mn10300/ to arch/mn10300/include/asm/. Signed-off-by: David Howells --- arch/mn10300/Makefile | 28 +++++++++---------- .../mn10300/include/asm}/Kbuild | 0 .../mn10300/include/asm}/atomic.h | 0 .../mn10300/include/asm}/auxvec.h | 0 .../mn10300/include/asm}/bitops.h | 0 .../mn10300/include/asm}/bug.h | 0 .../mn10300/include/asm}/bugs.h | 0 .../mn10300/include/asm}/busctl-regs.h | 0 .../mn10300/include/asm}/byteorder.h | 0 .../mn10300/include/asm}/cache.h | 0 .../mn10300/include/asm}/cacheflush.h | 0 .../mn10300/include/asm}/checksum.h | 0 .../mn10300/include/asm}/cpu-regs.h | 0 .../mn10300/include/asm}/cputime.h | 0 .../mn10300/include/asm}/current.h | 0 .../mn10300/include/asm}/delay.h | 0 .../mn10300/include/asm}/device.h | 0 .../mn10300/include/asm}/div64.h | 0 .../mn10300/include/asm}/dma-mapping.h | 0 .../mn10300/include/asm}/dma.h | 0 .../mn10300/include/asm}/dmactl-regs.h | 0 .../mn10300/include/asm}/elf.h | 0 .../mn10300/include/asm}/emergency-restart.h | 0 .../mn10300/include/asm}/errno.h | 0 .../mn10300/include/asm}/exceptions.h | 0 .../mn10300/include/asm}/fb.h | 0 .../mn10300/include/asm}/fcntl.h | 0 .../mn10300/include/asm}/fpu.h | 0 .../mn10300/include/asm}/frame.inc | 0 .../mn10300/include/asm}/ftrace.h | 0 .../mn10300/include/asm}/futex.h | 0 .../mn10300/include/asm}/gdb-stub.h | 0 .../mn10300/include/asm}/hardirq.h | 0 .../mn10300/include/asm}/highmem.h | 0 .../mn10300/include/asm}/hw_irq.h | 0 .../mn10300/include/asm}/intctl-regs.h | 0 .../mn10300/include/asm}/io.h | 0 .../mn10300/include/asm}/ioctl.h | 0 .../mn10300/include/asm}/ioctls.h | 0 .../mn10300/include/asm}/ipc.h | 0 .../mn10300/include/asm}/ipcbuf.h | 0 .../mn10300/include/asm}/irq.h | 0 .../mn10300/include/asm}/irq_regs.h | 0 .../mn10300/include/asm}/kdebug.h | 0 .../mn10300/include/asm}/kmap_types.h | 0 .../mn10300/include/asm}/kprobes.h | 0 .../mn10300/include/asm}/linkage.h | 0 .../mn10300/include/asm}/local.h | 0 .../mn10300/include/asm}/mc146818rtc.h | 0 .../mn10300/include/asm}/mman.h | 0 .../mn10300/include/asm}/mmu.h | 0 .../mn10300/include/asm}/mmu_context.h | 0 .../mn10300/include/asm}/module.h | 0 .../mn10300/include/asm}/msgbuf.h | 0 .../mn10300/include/asm}/mutex.h | 0 .../mn10300/include/asm}/nmi.h | 0 .../mn10300/include/asm}/page.h | 0 .../mn10300/include/asm}/page_offset.h | 0 .../mn10300/include/asm}/param.h | 0 .../mn10300/include/asm}/pci.h | 0 .../mn10300/include/asm}/percpu.h | 0 .../mn10300/include/asm}/pgalloc.h | 0 .../mn10300/include/asm}/pgtable.h | 0 .../mn10300/include/asm}/pio-regs.h | 0 .../mn10300/include/asm}/poll.h | 0 .../mn10300/include/asm}/posix_types.h | 0 .../include/asm}/proc-mn103e010/cache.h | 0 .../include/asm}/proc-mn103e010/clock.h | 0 .../mn10300/include/asm}/proc-mn103e010/irq.h | 0 .../include/asm}/proc-mn103e010/proc.h | 0 .../mn10300/include/asm}/processor.h | 0 .../mn10300/include/asm}/ptrace.h | 0 .../mn10300/include/asm}/reset-regs.h | 0 .../mn10300/include/asm}/resource.h | 0 .../mn10300/include/asm}/rtc-regs.h | 0 .../mn10300/include/asm}/rtc.h | 0 .../mn10300/include/asm}/scatterlist.h | 0 .../mn10300/include/asm}/sections.h | 0 .../mn10300/include/asm}/sembuf.h | 0 .../mn10300/include/asm}/serial-regs.h | 0 .../mn10300/include/asm}/serial.h | 0 .../mn10300/include/asm}/setup.h | 0 .../mn10300/include/asm}/shmbuf.h | 0 .../mn10300/include/asm}/shmparam.h | 0 .../mn10300/include/asm}/sigcontext.h | 0 .../mn10300/include/asm}/siginfo.h | 0 .../mn10300/include/asm}/signal.h | 0 .../mn10300/include/asm}/smp.h | 0 .../mn10300/include/asm}/socket.h | 0 .../mn10300/include/asm}/sockios.h | 0 .../mn10300/include/asm}/spinlock.h | 0 .../mn10300/include/asm}/stat.h | 0 .../mn10300/include/asm}/statfs.h | 0 .../mn10300/include/asm}/string.h | 0 .../mn10300/include/asm}/swab.h | 0 .../mn10300/include/asm}/system.h | 0 .../mn10300/include/asm}/termbits.h | 0 .../mn10300/include/asm}/termios.h | 0 .../mn10300/include/asm}/thread_info.h | 0 .../mn10300/include/asm}/timer-regs.h | 0 .../mn10300/include/asm}/timex.h | 0 .../mn10300/include/asm}/tlb.h | 0 .../mn10300/include/asm}/tlbflush.h | 0 .../mn10300/include/asm}/topology.h | 0 .../mn10300/include/asm}/types.h | 0 .../mn10300/include/asm}/uaccess.h | 0 .../mn10300/include/asm}/ucontext.h | 0 .../mn10300/include/asm}/unaligned.h | 0 .../mn10300/include/asm}/unistd.h | 0 .../mn10300/include/asm}/unit-asb2303/clock.h | 0 .../mn10300/include/asm}/unit-asb2303/leds.h | 0 .../include/asm}/unit-asb2303/serial.h | 0 .../include/asm}/unit-asb2303/smc91111.h | 0 .../mn10300/include/asm}/unit-asb2303/timex.h | 0 .../mn10300/include/asm}/unit-asb2305/clock.h | 0 .../mn10300/include/asm}/unit-asb2305/leds.h | 0 .../include/asm}/unit-asb2305/serial.h | 0 .../mn10300/include/asm}/unit-asb2305/timex.h | 0 .../mn10300/include/asm}/user.h | 0 .../mn10300/include/asm}/vga.h | 0 .../mn10300/include/asm}/xor.h | 0 121 files changed, 14 insertions(+), 14 deletions(-) rename {include/asm-mn10300 => arch/mn10300/include/asm}/Kbuild (100%) rename {include/asm-mn10300 => arch/mn10300/include/asm}/atomic.h (100%) rename {include/asm-mn10300 => arch/mn10300/include/asm}/auxvec.h (100%) rename {include/asm-mn10300 => arch/mn10300/include/asm}/bitops.h (100%) rename {include/asm-mn10300 => arch/mn10300/include/asm}/bug.h (100%) rename {include/asm-mn10300 => arch/mn10300/include/asm}/bugs.h (100%) rename {include/asm-mn10300 => arch/mn10300/include/asm}/busctl-regs.h (100%) rename {include/asm-mn10300 => arch/mn10300/include/asm}/byteorder.h (100%) rename {include/asm-mn10300 => arch/mn10300/include/asm}/cache.h (100%) rename {include/asm-mn10300 => arch/mn10300/include/asm}/cacheflush.h (100%) rename {include/asm-mn10300 => arch/mn10300/include/asm}/checksum.h (100%) rename {include/asm-mn10300 => arch/mn10300/include/asm}/cpu-regs.h (100%) rename {include/asm-mn10300 => arch/mn10300/include/asm}/cputime.h (100%) rename {include/asm-mn10300 => arch/mn10300/include/asm}/current.h (100%) rename {include/asm-mn10300 => arch/mn10300/include/asm}/delay.h (100%) rename {include/asm-mn10300 => arch/mn10300/include/asm}/device.h (100%) rename {include/asm-mn10300 => arch/mn10300/include/asm}/div64.h (100%) rename {include/asm-mn10300 => arch/mn10300/include/asm}/dma-mapping.h (100%) rename {include/asm-mn10300 => arch/mn10300/include/asm}/dma.h (100%) rename {include/asm-mn10300 => arch/mn10300/include/asm}/dmactl-regs.h (100%) rename {include/asm-mn10300 => arch/mn10300/include/asm}/elf.h (100%) rename {include/asm-mn10300 => arch/mn10300/include/asm}/emergency-restart.h (100%) rename {include/asm-mn10300 => arch/mn10300/include/asm}/errno.h (100%) rename {include/asm-mn10300 => arch/mn10300/include/asm}/exceptions.h (100%) rename {include/asm-mn10300 => arch/mn10300/include/asm}/fb.h (100%) rename {include/asm-mn10300 => arch/mn10300/include/asm}/fcntl.h (100%) rename {include/asm-mn10300 => arch/mn10300/include/asm}/fpu.h (100%) rename {include/asm-mn10300 => arch/mn10300/include/asm}/frame.inc (100%) rename {include/asm-mn10300 => arch/mn10300/include/asm}/ftrace.h (100%) rename {include/asm-mn10300 => arch/mn10300/include/asm}/futex.h (100%) rename {include/asm-mn10300 => arch/mn10300/include/asm}/gdb-stub.h (100%) rename {include/asm-mn10300 => arch/mn10300/include/asm}/hardirq.h (100%) rename {include/asm-mn10300 => arch/mn10300/include/asm}/highmem.h (100%) rename {include/asm-mn10300 => arch/mn10300/include/asm}/hw_irq.h (100%) rename {include/asm-mn10300 => arch/mn10300/include/asm}/intctl-regs.h (100%) rename {include/asm-mn10300 => arch/mn10300/include/asm}/io.h (100%) rename {include/asm-mn10300 => arch/mn10300/include/asm}/ioctl.h (100%) rename {include/asm-mn10300 => arch/mn10300/include/asm}/ioctls.h (100%) rename {include/asm-mn10300 => arch/mn10300/include/asm}/ipc.h (100%) rename {include/asm-mn10300 => arch/mn10300/include/asm}/ipcbuf.h (100%) rename {include/asm-mn10300 => arch/mn10300/include/asm}/irq.h (100%) rename {include/asm-mn10300 => arch/mn10300/include/asm}/irq_regs.h (100%) rename {include/asm-mn10300 => arch/mn10300/include/asm}/kdebug.h (100%) rename {include/asm-mn10300 => arch/mn10300/include/asm}/kmap_types.h (100%) rename {include/asm-mn10300 => arch/mn10300/include/asm}/kprobes.h (100%) rename {include/asm-mn10300 => arch/mn10300/include/asm}/linkage.h (100%) rename {include/asm-mn10300 => arch/mn10300/include/asm}/local.h (100%) rename {include/asm-mn10300 => arch/mn10300/include/asm}/mc146818rtc.h (100%) rename {include/asm-mn10300 => arch/mn10300/include/asm}/mman.h (100%) rename {include/asm-mn10300 => arch/mn10300/include/asm}/mmu.h (100%) rename {include/asm-mn10300 => arch/mn10300/include/asm}/mmu_context.h (100%) rename {include/asm-mn10300 => arch/mn10300/include/asm}/module.h (100%) rename {include/asm-mn10300 => arch/mn10300/include/asm}/msgbuf.h (100%) rename {include/asm-mn10300 => arch/mn10300/include/asm}/mutex.h (100%) rename {include/asm-mn10300 => arch/mn10300/include/asm}/nmi.h (100%) rename {include/asm-mn10300 => arch/mn10300/include/asm}/page.h (100%) rename {include/asm-mn10300 => arch/mn10300/include/asm}/page_offset.h (100%) rename {include/asm-mn10300 => arch/mn10300/include/asm}/param.h (100%) rename {include/asm-mn10300 => arch/mn10300/include/asm}/pci.h (100%) rename {include/asm-mn10300 => arch/mn10300/include/asm}/percpu.h (100%) rename {include/asm-mn10300 => arch/mn10300/include/asm}/pgalloc.h (100%) rename {include/asm-mn10300 => arch/mn10300/include/asm}/pgtable.h (100%) rename {include/asm-mn10300 => arch/mn10300/include/asm}/pio-regs.h (100%) rename {include/asm-mn10300 => arch/mn10300/include/asm}/poll.h (100%) rename {include/asm-mn10300 => arch/mn10300/include/asm}/posix_types.h (100%) rename {include/asm-mn10300 => arch/mn10300/include/asm}/proc-mn103e010/cache.h (100%) rename {include/asm-mn10300 => arch/mn10300/include/asm}/proc-mn103e010/clock.h (100%) rename {include/asm-mn10300 => arch/mn10300/include/asm}/proc-mn103e010/irq.h (100%) rename {include/asm-mn10300 => arch/mn10300/include/asm}/proc-mn103e010/proc.h (100%) rename {include/asm-mn10300 => arch/mn10300/include/asm}/processor.h (100%) rename {include/asm-mn10300 => arch/mn10300/include/asm}/ptrace.h (100%) rename {include/asm-mn10300 => arch/mn10300/include/asm}/reset-regs.h (100%) rename {include/asm-mn10300 => arch/mn10300/include/asm}/resource.h (100%) rename {include/asm-mn10300 => arch/mn10300/include/asm}/rtc-regs.h (100%) rename {include/asm-mn10300 => arch/mn10300/include/asm}/rtc.h (100%) rename {include/asm-mn10300 => arch/mn10300/include/asm}/scatterlist.h (100%) rename {include/asm-mn10300 => arch/mn10300/include/asm}/sections.h (100%) rename {include/asm-mn10300 => arch/mn10300/include/asm}/sembuf.h (100%) rename {include/asm-mn10300 => arch/mn10300/include/asm}/serial-regs.h (100%) rename {include/asm-mn10300 => arch/mn10300/include/asm}/serial.h (100%) rename {include/asm-mn10300 => arch/mn10300/include/asm}/setup.h (100%) rename {include/asm-mn10300 => arch/mn10300/include/asm}/shmbuf.h (100%) rename {include/asm-mn10300 => arch/mn10300/include/asm}/shmparam.h (100%) rename {include/asm-mn10300 => arch/mn10300/include/asm}/sigcontext.h (100%) rename {include/asm-mn10300 => arch/mn10300/include/asm}/siginfo.h (100%) rename {include/asm-mn10300 => arch/mn10300/include/asm}/signal.h (100%) rename {include/asm-mn10300 => arch/mn10300/include/asm}/smp.h (100%) rename {include/asm-mn10300 => arch/mn10300/include/asm}/socket.h (100%) rename {include/asm-mn10300 => arch/mn10300/include/asm}/sockios.h (100%) rename {include/asm-mn10300 => arch/mn10300/include/asm}/spinlock.h (100%) rename {include/asm-mn10300 => arch/mn10300/include/asm}/stat.h (100%) rename {include/asm-mn10300 => arch/mn10300/include/asm}/statfs.h (100%) rename {include/asm-mn10300 => arch/mn10300/include/asm}/string.h (100%) rename {include/asm-mn10300 => arch/mn10300/include/asm}/swab.h (100%) rename {include/asm-mn10300 => arch/mn10300/include/asm}/system.h (100%) rename {include/asm-mn10300 => arch/mn10300/include/asm}/termbits.h (100%) rename {include/asm-mn10300 => arch/mn10300/include/asm}/termios.h (100%) rename {include/asm-mn10300 => arch/mn10300/include/asm}/thread_info.h (100%) rename {include/asm-mn10300 => arch/mn10300/include/asm}/timer-regs.h (100%) rename {include/asm-mn10300 => arch/mn10300/include/asm}/timex.h (100%) rename {include/asm-mn10300 => arch/mn10300/include/asm}/tlb.h (100%) rename {include/asm-mn10300 => arch/mn10300/include/asm}/tlbflush.h (100%) rename {include/asm-mn10300 => arch/mn10300/include/asm}/topology.h (100%) rename {include/asm-mn10300 => arch/mn10300/include/asm}/types.h (100%) rename {include/asm-mn10300 => arch/mn10300/include/asm}/uaccess.h (100%) rename {include/asm-mn10300 => arch/mn10300/include/asm}/ucontext.h (100%) rename {include/asm-mn10300 => arch/mn10300/include/asm}/unaligned.h (100%) rename {include/asm-mn10300 => arch/mn10300/include/asm}/unistd.h (100%) rename {include/asm-mn10300 => arch/mn10300/include/asm}/unit-asb2303/clock.h (100%) rename {include/asm-mn10300 => arch/mn10300/include/asm}/unit-asb2303/leds.h (100%) rename {include/asm-mn10300 => arch/mn10300/include/asm}/unit-asb2303/serial.h (100%) rename {include/asm-mn10300 => arch/mn10300/include/asm}/unit-asb2303/smc91111.h (100%) rename {include/asm-mn10300 => arch/mn10300/include/asm}/unit-asb2303/timex.h (100%) rename {include/asm-mn10300 => arch/mn10300/include/asm}/unit-asb2305/clock.h (100%) rename {include/asm-mn10300 => arch/mn10300/include/asm}/unit-asb2305/leds.h (100%) rename {include/asm-mn10300 => arch/mn10300/include/asm}/unit-asb2305/serial.h (100%) rename {include/asm-mn10300 => arch/mn10300/include/asm}/unit-asb2305/timex.h (100%) rename {include/asm-mn10300 => arch/mn10300/include/asm}/user.h (100%) rename {include/asm-mn10300 => arch/mn10300/include/asm}/vga.h (100%) rename {include/asm-mn10300 => arch/mn10300/include/asm}/xor.h (100%) diff --git a/arch/mn10300/Makefile b/arch/mn10300/Makefile index 6673a28ec07a..a5985ee94140 100644 --- a/arch/mn10300/Makefile +++ b/arch/mn10300/Makefile @@ -105,31 +105,31 @@ endif ################################################################################################### # processor specific definitions -include/asm-mn10300/.proc: $(wildcard include/config/proc/*.h) include/config/auto.conf - @echo ' SYMLINK include/asm-mn10300/proc -> include/asm-mn10300/proc-$(PROCESSOR)' +arch/mn10300/include/asm/.proc: $(wildcard include/config/proc/*.h) include/config/auto.conf + @echo ' SYMLINK arch/mn10300/include/asm/proc -> arch/mn10300/include/asm/proc-$(PROCESSOR)' ifneq ($(KBUILD_SRC),) - $(Q)mkdir -p include/asm-mn10300 - $(Q)ln -fsn $(srctree)/include/asm-mn10300/proc-$(PROCESSOR) include/asm-mn10300/proc + $(Q)mkdir -p arch/mn10300/include/asm + $(Q)ln -fsn $(srctree)/arch/mn10300/include/asm/proc-$(PROCESSOR) arch/mn10300/include/asm/proc else - $(Q)ln -fsn proc-$(PROCESSOR) include/asm-mn10300/proc + $(Q)ln -fsn proc-$(PROCESSOR) arch/mn10300/include/asm/proc endif @touch $@ -CLEAN_FILES += include/asm-mn10300/proc include/asm-mn10300/.proc +CLEAN_FILES += arch/mn10300/include/asm/proc arch/mn10300/include/asm/.proc -prepare: include/asm-mn10300/.proc +prepare: arch/mn10300/include/asm/.proc # unit specific definitions -include/asm-mn10300/.unit: $(wildcard include/config/unit/*.h) include/config/auto.conf - @echo ' SYMLINK include/asm-mn10300/unit -> include/asm-mn10300/unit-$(UNIT)' +arch/mn10300/include/asm/.unit: $(wildcard include/config/unit/*.h) include/config/auto.conf + @echo ' SYMLINK arch/mn10300/include/asm/unit -> arch/mn10300/include/asm/unit-$(UNIT)' ifneq ($(KBUILD_SRC),) - $(Q)mkdir -p include/asm-mn10300 - $(Q)ln -fsn $(srctree)/include/asm-mn10300/unit-$(UNIT) include/asm-mn10300/unit + $(Q)mkdir -p arch/mn10300/include/asm + $(Q)ln -fsn $(srctree)/arch/mn10300/include/asm/unit-$(UNIT) arch/mn10300/include/asm/unit else - $(Q)ln -fsn unit-$(UNIT) include/asm-mn10300/unit + $(Q)ln -fsn unit-$(UNIT) arch/mn10300/include/asm/unit endif @touch $@ -CLEAN_FILES += include/asm-mn10300/unit include/asm-mn10300/.unit +CLEAN_FILES += arch/mn10300/include/asm/unit arch/mn10300/include/asm/.unit -prepare: include/asm-mn10300/.unit +prepare: arch/mn10300/include/asm/.unit diff --git a/include/asm-mn10300/Kbuild b/arch/mn10300/include/asm/Kbuild similarity index 100% rename from include/asm-mn10300/Kbuild rename to arch/mn10300/include/asm/Kbuild diff --git a/include/asm-mn10300/atomic.h b/arch/mn10300/include/asm/atomic.h similarity index 100% rename from include/asm-mn10300/atomic.h rename to arch/mn10300/include/asm/atomic.h diff --git a/include/asm-mn10300/auxvec.h b/arch/mn10300/include/asm/auxvec.h similarity index 100% rename from include/asm-mn10300/auxvec.h rename to arch/mn10300/include/asm/auxvec.h diff --git a/include/asm-mn10300/bitops.h b/arch/mn10300/include/asm/bitops.h similarity index 100% rename from include/asm-mn10300/bitops.h rename to arch/mn10300/include/asm/bitops.h diff --git a/include/asm-mn10300/bug.h b/arch/mn10300/include/asm/bug.h similarity index 100% rename from include/asm-mn10300/bug.h rename to arch/mn10300/include/asm/bug.h diff --git a/include/asm-mn10300/bugs.h b/arch/mn10300/include/asm/bugs.h similarity index 100% rename from include/asm-mn10300/bugs.h rename to arch/mn10300/include/asm/bugs.h diff --git a/include/asm-mn10300/busctl-regs.h b/arch/mn10300/include/asm/busctl-regs.h similarity index 100% rename from include/asm-mn10300/busctl-regs.h rename to arch/mn10300/include/asm/busctl-regs.h diff --git a/include/asm-mn10300/byteorder.h b/arch/mn10300/include/asm/byteorder.h similarity index 100% rename from include/asm-mn10300/byteorder.h rename to arch/mn10300/include/asm/byteorder.h diff --git a/include/asm-mn10300/cache.h b/arch/mn10300/include/asm/cache.h similarity index 100% rename from include/asm-mn10300/cache.h rename to arch/mn10300/include/asm/cache.h diff --git a/include/asm-mn10300/cacheflush.h b/arch/mn10300/include/asm/cacheflush.h similarity index 100% rename from include/asm-mn10300/cacheflush.h rename to arch/mn10300/include/asm/cacheflush.h diff --git a/include/asm-mn10300/checksum.h b/arch/mn10300/include/asm/checksum.h similarity index 100% rename from include/asm-mn10300/checksum.h rename to arch/mn10300/include/asm/checksum.h diff --git a/include/asm-mn10300/cpu-regs.h b/arch/mn10300/include/asm/cpu-regs.h similarity index 100% rename from include/asm-mn10300/cpu-regs.h rename to arch/mn10300/include/asm/cpu-regs.h diff --git a/include/asm-mn10300/cputime.h b/arch/mn10300/include/asm/cputime.h similarity index 100% rename from include/asm-mn10300/cputime.h rename to arch/mn10300/include/asm/cputime.h diff --git a/include/asm-mn10300/current.h b/arch/mn10300/include/asm/current.h similarity index 100% rename from include/asm-mn10300/current.h rename to arch/mn10300/include/asm/current.h diff --git a/include/asm-mn10300/delay.h b/arch/mn10300/include/asm/delay.h similarity index 100% rename from include/asm-mn10300/delay.h rename to arch/mn10300/include/asm/delay.h diff --git a/include/asm-mn10300/device.h b/arch/mn10300/include/asm/device.h similarity index 100% rename from include/asm-mn10300/device.h rename to arch/mn10300/include/asm/device.h diff --git a/include/asm-mn10300/div64.h b/arch/mn10300/include/asm/div64.h similarity index 100% rename from include/asm-mn10300/div64.h rename to arch/mn10300/include/asm/div64.h diff --git a/include/asm-mn10300/dma-mapping.h b/arch/mn10300/include/asm/dma-mapping.h similarity index 100% rename from include/asm-mn10300/dma-mapping.h rename to arch/mn10300/include/asm/dma-mapping.h diff --git a/include/asm-mn10300/dma.h b/arch/mn10300/include/asm/dma.h similarity index 100% rename from include/asm-mn10300/dma.h rename to arch/mn10300/include/asm/dma.h diff --git a/include/asm-mn10300/dmactl-regs.h b/arch/mn10300/include/asm/dmactl-regs.h similarity index 100% rename from include/asm-mn10300/dmactl-regs.h rename to arch/mn10300/include/asm/dmactl-regs.h diff --git a/include/asm-mn10300/elf.h b/arch/mn10300/include/asm/elf.h similarity index 100% rename from include/asm-mn10300/elf.h rename to arch/mn10300/include/asm/elf.h diff --git a/include/asm-mn10300/emergency-restart.h b/arch/mn10300/include/asm/emergency-restart.h similarity index 100% rename from include/asm-mn10300/emergency-restart.h rename to arch/mn10300/include/asm/emergency-restart.h diff --git a/include/asm-mn10300/errno.h b/arch/mn10300/include/asm/errno.h similarity index 100% rename from include/asm-mn10300/errno.h rename to arch/mn10300/include/asm/errno.h diff --git a/include/asm-mn10300/exceptions.h b/arch/mn10300/include/asm/exceptions.h similarity index 100% rename from include/asm-mn10300/exceptions.h rename to arch/mn10300/include/asm/exceptions.h diff --git a/include/asm-mn10300/fb.h b/arch/mn10300/include/asm/fb.h similarity index 100% rename from include/asm-mn10300/fb.h rename to arch/mn10300/include/asm/fb.h diff --git a/include/asm-mn10300/fcntl.h b/arch/mn10300/include/asm/fcntl.h similarity index 100% rename from include/asm-mn10300/fcntl.h rename to arch/mn10300/include/asm/fcntl.h diff --git a/include/asm-mn10300/fpu.h b/arch/mn10300/include/asm/fpu.h similarity index 100% rename from include/asm-mn10300/fpu.h rename to arch/mn10300/include/asm/fpu.h diff --git a/include/asm-mn10300/frame.inc b/arch/mn10300/include/asm/frame.inc similarity index 100% rename from include/asm-mn10300/frame.inc rename to arch/mn10300/include/asm/frame.inc diff --git a/include/asm-mn10300/ftrace.h b/arch/mn10300/include/asm/ftrace.h similarity index 100% rename from include/asm-mn10300/ftrace.h rename to arch/mn10300/include/asm/ftrace.h diff --git a/include/asm-mn10300/futex.h b/arch/mn10300/include/asm/futex.h similarity index 100% rename from include/asm-mn10300/futex.h rename to arch/mn10300/include/asm/futex.h diff --git a/include/asm-mn10300/gdb-stub.h b/arch/mn10300/include/asm/gdb-stub.h similarity index 100% rename from include/asm-mn10300/gdb-stub.h rename to arch/mn10300/include/asm/gdb-stub.h diff --git a/include/asm-mn10300/hardirq.h b/arch/mn10300/include/asm/hardirq.h similarity index 100% rename from include/asm-mn10300/hardirq.h rename to arch/mn10300/include/asm/hardirq.h diff --git a/include/asm-mn10300/highmem.h b/arch/mn10300/include/asm/highmem.h similarity index 100% rename from include/asm-mn10300/highmem.h rename to arch/mn10300/include/asm/highmem.h diff --git a/include/asm-mn10300/hw_irq.h b/arch/mn10300/include/asm/hw_irq.h similarity index 100% rename from include/asm-mn10300/hw_irq.h rename to arch/mn10300/include/asm/hw_irq.h diff --git a/include/asm-mn10300/intctl-regs.h b/arch/mn10300/include/asm/intctl-regs.h similarity index 100% rename from include/asm-mn10300/intctl-regs.h rename to arch/mn10300/include/asm/intctl-regs.h diff --git a/include/asm-mn10300/io.h b/arch/mn10300/include/asm/io.h similarity index 100% rename from include/asm-mn10300/io.h rename to arch/mn10300/include/asm/io.h diff --git a/include/asm-mn10300/ioctl.h b/arch/mn10300/include/asm/ioctl.h similarity index 100% rename from include/asm-mn10300/ioctl.h rename to arch/mn10300/include/asm/ioctl.h diff --git a/include/asm-mn10300/ioctls.h b/arch/mn10300/include/asm/ioctls.h similarity index 100% rename from include/asm-mn10300/ioctls.h rename to arch/mn10300/include/asm/ioctls.h diff --git a/include/asm-mn10300/ipc.h b/arch/mn10300/include/asm/ipc.h similarity index 100% rename from include/asm-mn10300/ipc.h rename to arch/mn10300/include/asm/ipc.h diff --git a/include/asm-mn10300/ipcbuf.h b/arch/mn10300/include/asm/ipcbuf.h similarity index 100% rename from include/asm-mn10300/ipcbuf.h rename to arch/mn10300/include/asm/ipcbuf.h diff --git a/include/asm-mn10300/irq.h b/arch/mn10300/include/asm/irq.h similarity index 100% rename from include/asm-mn10300/irq.h rename to arch/mn10300/include/asm/irq.h diff --git a/include/asm-mn10300/irq_regs.h b/arch/mn10300/include/asm/irq_regs.h similarity index 100% rename from include/asm-mn10300/irq_regs.h rename to arch/mn10300/include/asm/irq_regs.h diff --git a/include/asm-mn10300/kdebug.h b/arch/mn10300/include/asm/kdebug.h similarity index 100% rename from include/asm-mn10300/kdebug.h rename to arch/mn10300/include/asm/kdebug.h diff --git a/include/asm-mn10300/kmap_types.h b/arch/mn10300/include/asm/kmap_types.h similarity index 100% rename from include/asm-mn10300/kmap_types.h rename to arch/mn10300/include/asm/kmap_types.h diff --git a/include/asm-mn10300/kprobes.h b/arch/mn10300/include/asm/kprobes.h similarity index 100% rename from include/asm-mn10300/kprobes.h rename to arch/mn10300/include/asm/kprobes.h diff --git a/include/asm-mn10300/linkage.h b/arch/mn10300/include/asm/linkage.h similarity index 100% rename from include/asm-mn10300/linkage.h rename to arch/mn10300/include/asm/linkage.h diff --git a/include/asm-mn10300/local.h b/arch/mn10300/include/asm/local.h similarity index 100% rename from include/asm-mn10300/local.h rename to arch/mn10300/include/asm/local.h diff --git a/include/asm-mn10300/mc146818rtc.h b/arch/mn10300/include/asm/mc146818rtc.h similarity index 100% rename from include/asm-mn10300/mc146818rtc.h rename to arch/mn10300/include/asm/mc146818rtc.h diff --git a/include/asm-mn10300/mman.h b/arch/mn10300/include/asm/mman.h similarity index 100% rename from include/asm-mn10300/mman.h rename to arch/mn10300/include/asm/mman.h diff --git a/include/asm-mn10300/mmu.h b/arch/mn10300/include/asm/mmu.h similarity index 100% rename from include/asm-mn10300/mmu.h rename to arch/mn10300/include/asm/mmu.h diff --git a/include/asm-mn10300/mmu_context.h b/arch/mn10300/include/asm/mmu_context.h similarity index 100% rename from include/asm-mn10300/mmu_context.h rename to arch/mn10300/include/asm/mmu_context.h diff --git a/include/asm-mn10300/module.h b/arch/mn10300/include/asm/module.h similarity index 100% rename from include/asm-mn10300/module.h rename to arch/mn10300/include/asm/module.h diff --git a/include/asm-mn10300/msgbuf.h b/arch/mn10300/include/asm/msgbuf.h similarity index 100% rename from include/asm-mn10300/msgbuf.h rename to arch/mn10300/include/asm/msgbuf.h diff --git a/include/asm-mn10300/mutex.h b/arch/mn10300/include/asm/mutex.h similarity index 100% rename from include/asm-mn10300/mutex.h rename to arch/mn10300/include/asm/mutex.h diff --git a/include/asm-mn10300/nmi.h b/arch/mn10300/include/asm/nmi.h similarity index 100% rename from include/asm-mn10300/nmi.h rename to arch/mn10300/include/asm/nmi.h diff --git a/include/asm-mn10300/page.h b/arch/mn10300/include/asm/page.h similarity index 100% rename from include/asm-mn10300/page.h rename to arch/mn10300/include/asm/page.h diff --git a/include/asm-mn10300/page_offset.h b/arch/mn10300/include/asm/page_offset.h similarity index 100% rename from include/asm-mn10300/page_offset.h rename to arch/mn10300/include/asm/page_offset.h diff --git a/include/asm-mn10300/param.h b/arch/mn10300/include/asm/param.h similarity index 100% rename from include/asm-mn10300/param.h rename to arch/mn10300/include/asm/param.h diff --git a/include/asm-mn10300/pci.h b/arch/mn10300/include/asm/pci.h similarity index 100% rename from include/asm-mn10300/pci.h rename to arch/mn10300/include/asm/pci.h diff --git a/include/asm-mn10300/percpu.h b/arch/mn10300/include/asm/percpu.h similarity index 100% rename from include/asm-mn10300/percpu.h rename to arch/mn10300/include/asm/percpu.h diff --git a/include/asm-mn10300/pgalloc.h b/arch/mn10300/include/asm/pgalloc.h similarity index 100% rename from include/asm-mn10300/pgalloc.h rename to arch/mn10300/include/asm/pgalloc.h diff --git a/include/asm-mn10300/pgtable.h b/arch/mn10300/include/asm/pgtable.h similarity index 100% rename from include/asm-mn10300/pgtable.h rename to arch/mn10300/include/asm/pgtable.h diff --git a/include/asm-mn10300/pio-regs.h b/arch/mn10300/include/asm/pio-regs.h similarity index 100% rename from include/asm-mn10300/pio-regs.h rename to arch/mn10300/include/asm/pio-regs.h diff --git a/include/asm-mn10300/poll.h b/arch/mn10300/include/asm/poll.h similarity index 100% rename from include/asm-mn10300/poll.h rename to arch/mn10300/include/asm/poll.h diff --git a/include/asm-mn10300/posix_types.h b/arch/mn10300/include/asm/posix_types.h similarity index 100% rename from include/asm-mn10300/posix_types.h rename to arch/mn10300/include/asm/posix_types.h diff --git a/include/asm-mn10300/proc-mn103e010/cache.h b/arch/mn10300/include/asm/proc-mn103e010/cache.h similarity index 100% rename from include/asm-mn10300/proc-mn103e010/cache.h rename to arch/mn10300/include/asm/proc-mn103e010/cache.h diff --git a/include/asm-mn10300/proc-mn103e010/clock.h b/arch/mn10300/include/asm/proc-mn103e010/clock.h similarity index 100% rename from include/asm-mn10300/proc-mn103e010/clock.h rename to arch/mn10300/include/asm/proc-mn103e010/clock.h diff --git a/include/asm-mn10300/proc-mn103e010/irq.h b/arch/mn10300/include/asm/proc-mn103e010/irq.h similarity index 100% rename from include/asm-mn10300/proc-mn103e010/irq.h rename to arch/mn10300/include/asm/proc-mn103e010/irq.h diff --git a/include/asm-mn10300/proc-mn103e010/proc.h b/arch/mn10300/include/asm/proc-mn103e010/proc.h similarity index 100% rename from include/asm-mn10300/proc-mn103e010/proc.h rename to arch/mn10300/include/asm/proc-mn103e010/proc.h diff --git a/include/asm-mn10300/processor.h b/arch/mn10300/include/asm/processor.h similarity index 100% rename from include/asm-mn10300/processor.h rename to arch/mn10300/include/asm/processor.h diff --git a/include/asm-mn10300/ptrace.h b/arch/mn10300/include/asm/ptrace.h similarity index 100% rename from include/asm-mn10300/ptrace.h rename to arch/mn10300/include/asm/ptrace.h diff --git a/include/asm-mn10300/reset-regs.h b/arch/mn10300/include/asm/reset-regs.h similarity index 100% rename from include/asm-mn10300/reset-regs.h rename to arch/mn10300/include/asm/reset-regs.h diff --git a/include/asm-mn10300/resource.h b/arch/mn10300/include/asm/resource.h similarity index 100% rename from include/asm-mn10300/resource.h rename to arch/mn10300/include/asm/resource.h diff --git a/include/asm-mn10300/rtc-regs.h b/arch/mn10300/include/asm/rtc-regs.h similarity index 100% rename from include/asm-mn10300/rtc-regs.h rename to arch/mn10300/include/asm/rtc-regs.h diff --git a/include/asm-mn10300/rtc.h b/arch/mn10300/include/asm/rtc.h similarity index 100% rename from include/asm-mn10300/rtc.h rename to arch/mn10300/include/asm/rtc.h diff --git a/include/asm-mn10300/scatterlist.h b/arch/mn10300/include/asm/scatterlist.h similarity index 100% rename from include/asm-mn10300/scatterlist.h rename to arch/mn10300/include/asm/scatterlist.h diff --git a/include/asm-mn10300/sections.h b/arch/mn10300/include/asm/sections.h similarity index 100% rename from include/asm-mn10300/sections.h rename to arch/mn10300/include/asm/sections.h diff --git a/include/asm-mn10300/sembuf.h b/arch/mn10300/include/asm/sembuf.h similarity index 100% rename from include/asm-mn10300/sembuf.h rename to arch/mn10300/include/asm/sembuf.h diff --git a/include/asm-mn10300/serial-regs.h b/arch/mn10300/include/asm/serial-regs.h similarity index 100% rename from include/asm-mn10300/serial-regs.h rename to arch/mn10300/include/asm/serial-regs.h diff --git a/include/asm-mn10300/serial.h b/arch/mn10300/include/asm/serial.h similarity index 100% rename from include/asm-mn10300/serial.h rename to arch/mn10300/include/asm/serial.h diff --git a/include/asm-mn10300/setup.h b/arch/mn10300/include/asm/setup.h similarity index 100% rename from include/asm-mn10300/setup.h rename to arch/mn10300/include/asm/setup.h diff --git a/include/asm-mn10300/shmbuf.h b/arch/mn10300/include/asm/shmbuf.h similarity index 100% rename from include/asm-mn10300/shmbuf.h rename to arch/mn10300/include/asm/shmbuf.h diff --git a/include/asm-mn10300/shmparam.h b/arch/mn10300/include/asm/shmparam.h similarity index 100% rename from include/asm-mn10300/shmparam.h rename to arch/mn10300/include/asm/shmparam.h diff --git a/include/asm-mn10300/sigcontext.h b/arch/mn10300/include/asm/sigcontext.h similarity index 100% rename from include/asm-mn10300/sigcontext.h rename to arch/mn10300/include/asm/sigcontext.h diff --git a/include/asm-mn10300/siginfo.h b/arch/mn10300/include/asm/siginfo.h similarity index 100% rename from include/asm-mn10300/siginfo.h rename to arch/mn10300/include/asm/siginfo.h diff --git a/include/asm-mn10300/signal.h b/arch/mn10300/include/asm/signal.h similarity index 100% rename from include/asm-mn10300/signal.h rename to arch/mn10300/include/asm/signal.h diff --git a/include/asm-mn10300/smp.h b/arch/mn10300/include/asm/smp.h similarity index 100% rename from include/asm-mn10300/smp.h rename to arch/mn10300/include/asm/smp.h diff --git a/include/asm-mn10300/socket.h b/arch/mn10300/include/asm/socket.h similarity index 100% rename from include/asm-mn10300/socket.h rename to arch/mn10300/include/asm/socket.h diff --git a/include/asm-mn10300/sockios.h b/arch/mn10300/include/asm/sockios.h similarity index 100% rename from include/asm-mn10300/sockios.h rename to arch/mn10300/include/asm/sockios.h diff --git a/include/asm-mn10300/spinlock.h b/arch/mn10300/include/asm/spinlock.h similarity index 100% rename from include/asm-mn10300/spinlock.h rename to arch/mn10300/include/asm/spinlock.h diff --git a/include/asm-mn10300/stat.h b/arch/mn10300/include/asm/stat.h similarity index 100% rename from include/asm-mn10300/stat.h rename to arch/mn10300/include/asm/stat.h diff --git a/include/asm-mn10300/statfs.h b/arch/mn10300/include/asm/statfs.h similarity index 100% rename from include/asm-mn10300/statfs.h rename to arch/mn10300/include/asm/statfs.h diff --git a/include/asm-mn10300/string.h b/arch/mn10300/include/asm/string.h similarity index 100% rename from include/asm-mn10300/string.h rename to arch/mn10300/include/asm/string.h diff --git a/include/asm-mn10300/swab.h b/arch/mn10300/include/asm/swab.h similarity index 100% rename from include/asm-mn10300/swab.h rename to arch/mn10300/include/asm/swab.h diff --git a/include/asm-mn10300/system.h b/arch/mn10300/include/asm/system.h similarity index 100% rename from include/asm-mn10300/system.h rename to arch/mn10300/include/asm/system.h diff --git a/include/asm-mn10300/termbits.h b/arch/mn10300/include/asm/termbits.h similarity index 100% rename from include/asm-mn10300/termbits.h rename to arch/mn10300/include/asm/termbits.h diff --git a/include/asm-mn10300/termios.h b/arch/mn10300/include/asm/termios.h similarity index 100% rename from include/asm-mn10300/termios.h rename to arch/mn10300/include/asm/termios.h diff --git a/include/asm-mn10300/thread_info.h b/arch/mn10300/include/asm/thread_info.h similarity index 100% rename from include/asm-mn10300/thread_info.h rename to arch/mn10300/include/asm/thread_info.h diff --git a/include/asm-mn10300/timer-regs.h b/arch/mn10300/include/asm/timer-regs.h similarity index 100% rename from include/asm-mn10300/timer-regs.h rename to arch/mn10300/include/asm/timer-regs.h diff --git a/include/asm-mn10300/timex.h b/arch/mn10300/include/asm/timex.h similarity index 100% rename from include/asm-mn10300/timex.h rename to arch/mn10300/include/asm/timex.h diff --git a/include/asm-mn10300/tlb.h b/arch/mn10300/include/asm/tlb.h similarity index 100% rename from include/asm-mn10300/tlb.h rename to arch/mn10300/include/asm/tlb.h diff --git a/include/asm-mn10300/tlbflush.h b/arch/mn10300/include/asm/tlbflush.h similarity index 100% rename from include/asm-mn10300/tlbflush.h rename to arch/mn10300/include/asm/tlbflush.h diff --git a/include/asm-mn10300/topology.h b/arch/mn10300/include/asm/topology.h similarity index 100% rename from include/asm-mn10300/topology.h rename to arch/mn10300/include/asm/topology.h diff --git a/include/asm-mn10300/types.h b/arch/mn10300/include/asm/types.h similarity index 100% rename from include/asm-mn10300/types.h rename to arch/mn10300/include/asm/types.h diff --git a/include/asm-mn10300/uaccess.h b/arch/mn10300/include/asm/uaccess.h similarity index 100% rename from include/asm-mn10300/uaccess.h rename to arch/mn10300/include/asm/uaccess.h diff --git a/include/asm-mn10300/ucontext.h b/arch/mn10300/include/asm/ucontext.h similarity index 100% rename from include/asm-mn10300/ucontext.h rename to arch/mn10300/include/asm/ucontext.h diff --git a/include/asm-mn10300/unaligned.h b/arch/mn10300/include/asm/unaligned.h similarity index 100% rename from include/asm-mn10300/unaligned.h rename to arch/mn10300/include/asm/unaligned.h diff --git a/include/asm-mn10300/unistd.h b/arch/mn10300/include/asm/unistd.h similarity index 100% rename from include/asm-mn10300/unistd.h rename to arch/mn10300/include/asm/unistd.h diff --git a/include/asm-mn10300/unit-asb2303/clock.h b/arch/mn10300/include/asm/unit-asb2303/clock.h similarity index 100% rename from include/asm-mn10300/unit-asb2303/clock.h rename to arch/mn10300/include/asm/unit-asb2303/clock.h diff --git a/include/asm-mn10300/unit-asb2303/leds.h b/arch/mn10300/include/asm/unit-asb2303/leds.h similarity index 100% rename from include/asm-mn10300/unit-asb2303/leds.h rename to arch/mn10300/include/asm/unit-asb2303/leds.h diff --git a/include/asm-mn10300/unit-asb2303/serial.h b/arch/mn10300/include/asm/unit-asb2303/serial.h similarity index 100% rename from include/asm-mn10300/unit-asb2303/serial.h rename to arch/mn10300/include/asm/unit-asb2303/serial.h diff --git a/include/asm-mn10300/unit-asb2303/smc91111.h b/arch/mn10300/include/asm/unit-asb2303/smc91111.h similarity index 100% rename from include/asm-mn10300/unit-asb2303/smc91111.h rename to arch/mn10300/include/asm/unit-asb2303/smc91111.h diff --git a/include/asm-mn10300/unit-asb2303/timex.h b/arch/mn10300/include/asm/unit-asb2303/timex.h similarity index 100% rename from include/asm-mn10300/unit-asb2303/timex.h rename to arch/mn10300/include/asm/unit-asb2303/timex.h diff --git a/include/asm-mn10300/unit-asb2305/clock.h b/arch/mn10300/include/asm/unit-asb2305/clock.h similarity index 100% rename from include/asm-mn10300/unit-asb2305/clock.h rename to arch/mn10300/include/asm/unit-asb2305/clock.h diff --git a/include/asm-mn10300/unit-asb2305/leds.h b/arch/mn10300/include/asm/unit-asb2305/leds.h similarity index 100% rename from include/asm-mn10300/unit-asb2305/leds.h rename to arch/mn10300/include/asm/unit-asb2305/leds.h diff --git a/include/asm-mn10300/unit-asb2305/serial.h b/arch/mn10300/include/asm/unit-asb2305/serial.h similarity index 100% rename from include/asm-mn10300/unit-asb2305/serial.h rename to arch/mn10300/include/asm/unit-asb2305/serial.h diff --git a/include/asm-mn10300/unit-asb2305/timex.h b/arch/mn10300/include/asm/unit-asb2305/timex.h similarity index 100% rename from include/asm-mn10300/unit-asb2305/timex.h rename to arch/mn10300/include/asm/unit-asb2305/timex.h diff --git a/include/asm-mn10300/user.h b/arch/mn10300/include/asm/user.h similarity index 100% rename from include/asm-mn10300/user.h rename to arch/mn10300/include/asm/user.h diff --git a/include/asm-mn10300/vga.h b/arch/mn10300/include/asm/vga.h similarity index 100% rename from include/asm-mn10300/vga.h rename to arch/mn10300/include/asm/vga.h diff --git a/include/asm-mn10300/xor.h b/arch/mn10300/include/asm/xor.h similarity index 100% rename from include/asm-mn10300/xor.h rename to arch/mn10300/include/asm/xor.h -- 2.20.1