Merge git://git.kernel.org/pub/scm/linux/kernel/git/dhowells/linux-2.…

…6-mn10300 * git://git.kernel.org/pub/scm/linux/kernel/git/dhowells/linux-2.6-mn10300: Separate out the proc- and unit-specific header directories from the general Move arch headers from include/asm-mn10300/ to arch/mn10300/include/asm/.
mariux64 · Apr 10, 2009 · d848223 · d848223
2 parents 5de4c51 + 2f2a213
commit d848223
Show file tree

Hide file tree

Showing 138 changed files with 31 additions and 65 deletions.
diff --git a/arch/mn10300/Makefile b/arch/mn10300/Makefile
@@ -94,42 +94,8 @@ ifdef CONFIG_DEBUG_INFO
 KBUILD_AFLAGS	+= -Wa,--gdwarf2
 endif
 
-###################################################################################################
 #
-# juggle some symlinks in the MN10300 asm include dir
+# include the appropriate processor- and unit-specific headers
 #
-#	Update machine proc and unit symlinks if something which affects
-#	them changed.  We use .proc / .unit to indicate when they were
-#	updated last, otherwise make uses the target directory mtime.
-#
-###################################################################################################
-
-# 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)'
-ifneq ($(KBUILD_SRC),)
-	$(Q)mkdir -p include/asm-mn10300
-	$(Q)ln -fsn $(srctree)/include/asm-mn10300/proc-$(PROCESSOR) include/asm-mn10300/proc
-else
-	$(Q)ln -fsn proc-$(PROCESSOR) include/asm-mn10300/proc
-endif
-	@touch $@
-
-CLEAN_FILES += include/asm-mn10300/proc include/asm-mn10300/.proc
-
-prepare: include/asm-mn10300/.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)'
-ifneq ($(KBUILD_SRC),)
-	$(Q)mkdir -p include/asm-mn10300
-	$(Q)ln -fsn $(srctree)/include/asm-mn10300/unit-$(UNIT) include/asm-mn10300/unit
-else
-	$(Q)ln -fsn unit-$(UNIT) include/asm-mn10300/unit
-endif
-	@touch $@
-
-CLEAN_FILES += include/asm-mn10300/unit include/asm-mn10300/.unit
-
-prepare: include/asm-mn10300/.unit
+KBUILD_CPPFLAGS += -I$(srctree)/arch/mn10300/proc-$(PROCESSOR)/include
+KBUILD_CPPFLAGS += -I$(srctree)/arch/mn10300/unit-$(UNIT)/include
diff --git a/include/asm-mn10300/Kbuild → arch/mn10300/include/asm/Kbuild b/include/asm-mn10300/Kbuild → arch/mn10300/include/asm/Kbuild
diff --git a/include/asm-mn10300/atomic.h → arch/mn10300/include/asm/atomic.h b/include/asm-mn10300/atomic.h → arch/mn10300/include/asm/atomic.h
diff --git a/include/asm-mn10300/auxvec.h → arch/mn10300/include/asm/auxvec.h b/include/asm-mn10300/auxvec.h → arch/mn10300/include/asm/auxvec.h
diff --git a/include/asm-mn10300/bitops.h → arch/mn10300/include/asm/bitops.h b/include/asm-mn10300/bitops.h → arch/mn10300/include/asm/bitops.h
diff --git a/include/asm-mn10300/bug.h → arch/mn10300/include/asm/bug.h b/include/asm-mn10300/bug.h → arch/mn10300/include/asm/bug.h
diff --git a/include/asm-mn10300/bugs.h → arch/mn10300/include/asm/bugs.h b/include/asm-mn10300/bugs.h → arch/mn10300/include/asm/bugs.h
diff --git a/include/asm-mn10300/busctl-regs.h → arch/mn10300/include/asm/busctl-regs.h b/include/asm-mn10300/busctl-regs.h → arch/mn10300/include/asm/busctl-regs.h
diff --git a/include/asm-mn10300/byteorder.h → arch/mn10300/include/asm/byteorder.h b/include/asm-mn10300/byteorder.h → arch/mn10300/include/asm/byteorder.h
diff --git a/include/asm-mn10300/cache.h → arch/mn10300/include/asm/cache.h b/include/asm-mn10300/cache.h → arch/mn10300/include/asm/cache.h
@@ -13,7 +13,7 @@
 #define _ASM_CACHE_H
 
 #include <asm/cpu-regs.h>
-#include <asm/proc/cache.h>
+#include <proc/cache.h>
 
 #ifndef __ASSEMBLY__
 #define L1_CACHE_DISPARITY	(L1_CACHE_NENTRIES * L1_CACHE_BYTES)

diff --git a/include/asm-mn10300/cacheflush.h → arch/mn10300/include/asm/cacheflush.h b/include/asm-mn10300/cacheflush.h → arch/mn10300/include/asm/cacheflush.h
diff --git a/include/asm-mn10300/checksum.h → arch/mn10300/include/asm/checksum.h b/include/asm-mn10300/checksum.h → arch/mn10300/include/asm/checksum.h
diff --git a/include/asm-mn10300/cpu-regs.h → arch/mn10300/include/asm/cpu-regs.h b/include/asm-mn10300/cpu-regs.h → arch/mn10300/include/asm/cpu-regs.h
diff --git a/include/asm-mn10300/cputime.h → arch/mn10300/include/asm/cputime.h b/include/asm-mn10300/cputime.h → arch/mn10300/include/asm/cputime.h
diff --git a/include/asm-mn10300/current.h → arch/mn10300/include/asm/current.h b/include/asm-mn10300/current.h → arch/mn10300/include/asm/current.h
diff --git a/include/asm-mn10300/delay.h → arch/mn10300/include/asm/delay.h b/include/asm-mn10300/delay.h → arch/mn10300/include/asm/delay.h
diff --git a/include/asm-mn10300/device.h → arch/mn10300/include/asm/device.h b/include/asm-mn10300/device.h → arch/mn10300/include/asm/device.h
diff --git a/include/asm-mn10300/div64.h → arch/mn10300/include/asm/div64.h b/include/asm-mn10300/div64.h → arch/mn10300/include/asm/div64.h
diff --git a/include/asm-mn10300/dma-mapping.h → arch/mn10300/include/asm/dma-mapping.h b/include/asm-mn10300/dma-mapping.h → arch/mn10300/include/asm/dma-mapping.h
diff --git a/include/asm-mn10300/dma.h → arch/mn10300/include/asm/dma.h b/include/asm-mn10300/dma.h → arch/mn10300/include/asm/dma.h
diff --git a/include/asm-mn10300/dmactl-regs.h → arch/mn10300/include/asm/dmactl-regs.h b/include/asm-mn10300/dmactl-regs.h → arch/mn10300/include/asm/dmactl-regs.h
diff --git a/include/asm-mn10300/elf.h → arch/mn10300/include/asm/elf.h b/include/asm-mn10300/elf.h → arch/mn10300/include/asm/elf.h
diff --git a/include/asm-mn10300/emergency-restart.h → arch/mn10300/include/asm/emergency-restart.h b/include/asm-mn10300/emergency-restart.h → arch/mn10300/include/asm/emergency-restart.h
diff --git a/include/asm-mn10300/errno.h → arch/mn10300/include/asm/errno.h b/include/asm-mn10300/errno.h → arch/mn10300/include/asm/errno.h
diff --git a/include/asm-mn10300/exceptions.h → arch/mn10300/include/asm/exceptions.h b/include/asm-mn10300/exceptions.h → arch/mn10300/include/asm/exceptions.h
diff --git a/include/asm-mn10300/fb.h → arch/mn10300/include/asm/fb.h b/include/asm-mn10300/fb.h → arch/mn10300/include/asm/fb.h
diff --git a/include/asm-mn10300/fcntl.h → arch/mn10300/include/asm/fcntl.h b/include/asm-mn10300/fcntl.h → arch/mn10300/include/asm/fcntl.h
diff --git a/include/asm-mn10300/fpu.h → arch/mn10300/include/asm/fpu.h b/include/asm-mn10300/fpu.h → arch/mn10300/include/asm/fpu.h
diff --git a/include/asm-mn10300/frame.inc → arch/mn10300/include/asm/frame.inc b/include/asm-mn10300/frame.inc → arch/mn10300/include/asm/frame.inc
diff --git a/include/asm-mn10300/ftrace.h → arch/mn10300/include/asm/ftrace.h b/include/asm-mn10300/ftrace.h → arch/mn10300/include/asm/ftrace.h
diff --git a/include/asm-mn10300/futex.h → arch/mn10300/include/asm/futex.h b/include/asm-mn10300/futex.h → arch/mn10300/include/asm/futex.h
diff --git a/include/asm-mn10300/gdb-stub.h → arch/mn10300/include/asm/gdb-stub.h b/include/asm-mn10300/gdb-stub.h → arch/mn10300/include/asm/gdb-stub.h
diff --git a/include/asm-mn10300/hardirq.h → arch/mn10300/include/asm/hardirq.h b/include/asm-mn10300/hardirq.h → arch/mn10300/include/asm/hardirq.h
diff --git a/include/asm-mn10300/highmem.h → arch/mn10300/include/asm/highmem.h b/include/asm-mn10300/highmem.h → arch/mn10300/include/asm/highmem.h
diff --git a/include/asm-mn10300/hw_irq.h → arch/mn10300/include/asm/hw_irq.h b/include/asm-mn10300/hw_irq.h → arch/mn10300/include/asm/hw_irq.h
diff --git a/include/asm-mn10300/intctl-regs.h → arch/mn10300/include/asm/intctl-regs.h b/include/asm-mn10300/intctl-regs.h → arch/mn10300/include/asm/intctl-regs.h
diff --git a/include/asm-mn10300/io.h → arch/mn10300/include/asm/io.h b/include/asm-mn10300/io.h → arch/mn10300/include/asm/io.h
diff --git a/include/asm-mn10300/ioctl.h → arch/mn10300/include/asm/ioctl.h b/include/asm-mn10300/ioctl.h → arch/mn10300/include/asm/ioctl.h
diff --git a/include/asm-mn10300/ioctls.h → arch/mn10300/include/asm/ioctls.h b/include/asm-mn10300/ioctls.h → arch/mn10300/include/asm/ioctls.h
diff --git a/include/asm-mn10300/ipc.h → arch/mn10300/include/asm/ipc.h b/include/asm-mn10300/ipc.h → arch/mn10300/include/asm/ipc.h
diff --git a/include/asm-mn10300/ipcbuf.h → arch/mn10300/include/asm/ipcbuf.h b/include/asm-mn10300/ipcbuf.h → arch/mn10300/include/asm/ipcbuf.h
diff --git a/include/asm-mn10300/irq.h → arch/mn10300/include/asm/irq.h b/include/asm-mn10300/irq.h → arch/mn10300/include/asm/irq.h
@@ -16,7 +16,7 @@
 
 #include <asm/intctl-regs.h>
 #include <asm/reset-regs.h>
-#include <asm/proc/irq.h>
+#include <proc/irq.h>
 
 /* this number is used when no interrupt has been assigned */
 #define NO_IRQ		INT_MAX

diff --git a/include/asm-mn10300/irq_regs.h → arch/mn10300/include/asm/irq_regs.h b/include/asm-mn10300/irq_regs.h → arch/mn10300/include/asm/irq_regs.h
diff --git a/include/asm-mn10300/kdebug.h → arch/mn10300/include/asm/kdebug.h b/include/asm-mn10300/kdebug.h → arch/mn10300/include/asm/kdebug.h
diff --git a/include/asm-mn10300/kmap_types.h → arch/mn10300/include/asm/kmap_types.h b/include/asm-mn10300/kmap_types.h → arch/mn10300/include/asm/kmap_types.h
diff --git a/include/asm-mn10300/kprobes.h → arch/mn10300/include/asm/kprobes.h b/include/asm-mn10300/kprobes.h → arch/mn10300/include/asm/kprobes.h
diff --git a/include/asm-mn10300/linkage.h → arch/mn10300/include/asm/linkage.h b/include/asm-mn10300/linkage.h → arch/mn10300/include/asm/linkage.h
diff --git a/include/asm-mn10300/local.h → arch/mn10300/include/asm/local.h b/include/asm-mn10300/local.h → arch/mn10300/include/asm/local.h
diff --git a/include/asm-mn10300/mc146818rtc.h → arch/mn10300/include/asm/mc146818rtc.h b/include/asm-mn10300/mc146818rtc.h → arch/mn10300/include/asm/mc146818rtc.h
diff --git a/include/asm-mn10300/mman.h → arch/mn10300/include/asm/mman.h b/include/asm-mn10300/mman.h → arch/mn10300/include/asm/mman.h
diff --git a/include/asm-mn10300/mmu.h → arch/mn10300/include/asm/mmu.h b/include/asm-mn10300/mmu.h → arch/mn10300/include/asm/mmu.h
diff --git a/include/asm-mn10300/mmu_context.h → arch/mn10300/include/asm/mmu_context.h b/include/asm-mn10300/mmu_context.h → arch/mn10300/include/asm/mmu_context.h
diff --git a/include/asm-mn10300/module.h → arch/mn10300/include/asm/module.h b/include/asm-mn10300/module.h → arch/mn10300/include/asm/module.h
diff --git a/include/asm-mn10300/msgbuf.h → arch/mn10300/include/asm/msgbuf.h b/include/asm-mn10300/msgbuf.h → arch/mn10300/include/asm/msgbuf.h
diff --git a/include/asm-mn10300/mutex.h → arch/mn10300/include/asm/mutex.h b/include/asm-mn10300/mutex.h → arch/mn10300/include/asm/mutex.h
diff --git a/include/asm-mn10300/nmi.h → arch/mn10300/include/asm/nmi.h b/include/asm-mn10300/nmi.h → arch/mn10300/include/asm/nmi.h
diff --git a/include/asm-mn10300/page.h → arch/mn10300/include/asm/page.h b/include/asm-mn10300/page.h → arch/mn10300/include/asm/page.h
diff --git a/include/asm-mn10300/page_offset.h → arch/mn10300/include/asm/page_offset.h b/include/asm-mn10300/page_offset.h → arch/mn10300/include/asm/page_offset.h
diff --git a/include/asm-mn10300/param.h → arch/mn10300/include/asm/param.h b/include/asm-mn10300/param.h → arch/mn10300/include/asm/param.h
diff --git a/include/asm-mn10300/pci.h → arch/mn10300/include/asm/pci.h b/include/asm-mn10300/pci.h → arch/mn10300/include/asm/pci.h
diff --git a/include/asm-mn10300/percpu.h → arch/mn10300/include/asm/percpu.h b/include/asm-mn10300/percpu.h → arch/mn10300/include/asm/percpu.h
diff --git a/include/asm-mn10300/pgalloc.h → arch/mn10300/include/asm/pgalloc.h b/include/asm-mn10300/pgalloc.h → arch/mn10300/include/asm/pgalloc.h
diff --git a/include/asm-mn10300/pgtable.h → arch/mn10300/include/asm/pgtable.h b/include/asm-mn10300/pgtable.h → arch/mn10300/include/asm/pgtable.h
diff --git a/include/asm-mn10300/pio-regs.h → arch/mn10300/include/asm/pio-regs.h b/include/asm-mn10300/pio-regs.h → arch/mn10300/include/asm/pio-regs.h
diff --git a/include/asm-mn10300/poll.h → arch/mn10300/include/asm/poll.h b/include/asm-mn10300/poll.h → arch/mn10300/include/asm/poll.h
diff --git a/include/asm-mn10300/posix_types.h → arch/mn10300/include/asm/posix_types.h b/include/asm-mn10300/posix_types.h → arch/mn10300/include/asm/posix_types.h
diff --git a/include/asm-mn10300/processor.h → arch/mn10300/include/asm/processor.h b/include/asm-mn10300/processor.h → arch/mn10300/include/asm/processor.h
diff --git a/include/asm-mn10300/ptrace.h → arch/mn10300/include/asm/ptrace.h b/include/asm-mn10300/ptrace.h → arch/mn10300/include/asm/ptrace.h
diff --git a/include/asm-mn10300/reset-regs.h → arch/mn10300/include/asm/reset-regs.h b/include/asm-mn10300/reset-regs.h → arch/mn10300/include/asm/reset-regs.h
diff --git a/include/asm-mn10300/resource.h → arch/mn10300/include/asm/resource.h b/include/asm-mn10300/resource.h → arch/mn10300/include/asm/resource.h
diff --git a/include/asm-mn10300/rtc-regs.h → arch/mn10300/include/asm/rtc-regs.h b/include/asm-mn10300/rtc-regs.h → arch/mn10300/include/asm/rtc-regs.h
diff --git a/include/asm-mn10300/rtc.h → arch/mn10300/include/asm/rtc.h b/include/asm-mn10300/rtc.h → arch/mn10300/include/asm/rtc.h
diff --git a/include/asm-mn10300/scatterlist.h → arch/mn10300/include/asm/scatterlist.h b/include/asm-mn10300/scatterlist.h → arch/mn10300/include/asm/scatterlist.h
diff --git a/include/asm-mn10300/sections.h → arch/mn10300/include/asm/sections.h b/include/asm-mn10300/sections.h → arch/mn10300/include/asm/sections.h
diff --git a/include/asm-mn10300/sembuf.h → arch/mn10300/include/asm/sembuf.h b/include/asm-mn10300/sembuf.h → arch/mn10300/include/asm/sembuf.h
diff --git a/include/asm-mn10300/serial-regs.h → arch/mn10300/include/asm/serial-regs.h b/include/asm-mn10300/serial-regs.h → arch/mn10300/include/asm/serial-regs.h
diff --git a/include/asm-mn10300/serial.h → arch/mn10300/include/asm/serial.h b/include/asm-mn10300/serial.h → arch/mn10300/include/asm/serial.h
@@ -33,4 +33,4 @@
 #define RS_TABLE_SIZE
 #endif
 
-#include <asm/unit/serial.h>
+#include <unit/serial.h>
diff --git a/include/asm-mn10300/setup.h → arch/mn10300/include/asm/setup.h b/include/asm-mn10300/setup.h → arch/mn10300/include/asm/setup.h
diff --git a/include/asm-mn10300/shmbuf.h → arch/mn10300/include/asm/shmbuf.h b/include/asm-mn10300/shmbuf.h → arch/mn10300/include/asm/shmbuf.h
diff --git a/include/asm-mn10300/shmparam.h → arch/mn10300/include/asm/shmparam.h b/include/asm-mn10300/shmparam.h → arch/mn10300/include/asm/shmparam.h
diff --git a/include/asm-mn10300/sigcontext.h → arch/mn10300/include/asm/sigcontext.h b/include/asm-mn10300/sigcontext.h → arch/mn10300/include/asm/sigcontext.h
diff --git a/include/asm-mn10300/siginfo.h → arch/mn10300/include/asm/siginfo.h b/include/asm-mn10300/siginfo.h → arch/mn10300/include/asm/siginfo.h
diff --git a/include/asm-mn10300/signal.h → arch/mn10300/include/asm/signal.h b/include/asm-mn10300/signal.h → arch/mn10300/include/asm/signal.h
diff --git a/include/asm-mn10300/smp.h → arch/mn10300/include/asm/smp.h b/include/asm-mn10300/smp.h → arch/mn10300/include/asm/smp.h
diff --git a/include/asm-mn10300/socket.h → arch/mn10300/include/asm/socket.h b/include/asm-mn10300/socket.h → arch/mn10300/include/asm/socket.h
diff --git a/include/asm-mn10300/sockios.h → arch/mn10300/include/asm/sockios.h b/include/asm-mn10300/sockios.h → arch/mn10300/include/asm/sockios.h
diff --git a/include/asm-mn10300/spinlock.h → arch/mn10300/include/asm/spinlock.h b/include/asm-mn10300/spinlock.h → arch/mn10300/include/asm/spinlock.h
diff --git a/include/asm-mn10300/stat.h → arch/mn10300/include/asm/stat.h b/include/asm-mn10300/stat.h → arch/mn10300/include/asm/stat.h
diff --git a/include/asm-mn10300/statfs.h → arch/mn10300/include/asm/statfs.h b/include/asm-mn10300/statfs.h → arch/mn10300/include/asm/statfs.h
diff --git a/include/asm-mn10300/string.h → arch/mn10300/include/asm/string.h b/include/asm-mn10300/string.h → arch/mn10300/include/asm/string.h
diff --git a/include/asm-mn10300/swab.h → arch/mn10300/include/asm/swab.h b/include/asm-mn10300/swab.h → arch/mn10300/include/asm/swab.h
diff --git a/include/asm-mn10300/system.h → arch/mn10300/include/asm/system.h b/include/asm-mn10300/system.h → arch/mn10300/include/asm/system.h
diff --git a/include/asm-mn10300/termbits.h → arch/mn10300/include/asm/termbits.h b/include/asm-mn10300/termbits.h → arch/mn10300/include/asm/termbits.h
diff --git a/include/asm-mn10300/termios.h → arch/mn10300/include/asm/termios.h b/include/asm-mn10300/termios.h → arch/mn10300/include/asm/termios.h
diff --git a/include/asm-mn10300/thread_info.h → arch/mn10300/include/asm/thread_info.h b/include/asm-mn10300/thread_info.h → arch/mn10300/include/asm/thread_info.h
diff --git a/include/asm-mn10300/timer-regs.h → arch/mn10300/include/asm/timer-regs.h b/include/asm-mn10300/timer-regs.h → arch/mn10300/include/asm/timer-regs.h
diff --git a/include/asm-mn10300/timex.h → arch/mn10300/include/asm/timex.h b/include/asm-mn10300/timex.h → arch/mn10300/include/asm/timex.h
@@ -12,7 +12,7 @@
 #define _ASM_TIMEX_H
 
 #include <asm/hardirq.h>
-#include <asm/unit/timex.h>
+#include <unit/timex.h>
 
 #define TICK_SIZE (tick_nsec / 1000)
 

diff --git a/include/asm-mn10300/tlb.h → arch/mn10300/include/asm/tlb.h b/include/asm-mn10300/tlb.h → arch/mn10300/include/asm/tlb.h
diff --git a/include/asm-mn10300/tlbflush.h → arch/mn10300/include/asm/tlbflush.h b/include/asm-mn10300/tlbflush.h → arch/mn10300/include/asm/tlbflush.h
diff --git a/include/asm-mn10300/topology.h → arch/mn10300/include/asm/topology.h b/include/asm-mn10300/topology.h → arch/mn10300/include/asm/topology.h
diff --git a/include/asm-mn10300/types.h → arch/mn10300/include/asm/types.h b/include/asm-mn10300/types.h → arch/mn10300/include/asm/types.h
diff --git a/include/asm-mn10300/uaccess.h → arch/mn10300/include/asm/uaccess.h b/include/asm-mn10300/uaccess.h → arch/mn10300/include/asm/uaccess.h
diff --git a/include/asm-mn10300/ucontext.h → arch/mn10300/include/asm/ucontext.h b/include/asm-mn10300/ucontext.h → arch/mn10300/include/asm/ucontext.h
diff --git a/include/asm-mn10300/unaligned.h → arch/mn10300/include/asm/unaligned.h b/include/asm-mn10300/unaligned.h → arch/mn10300/include/asm/unaligned.h
diff --git a/include/asm-mn10300/unistd.h → arch/mn10300/include/asm/unistd.h b/include/asm-mn10300/unistd.h → arch/mn10300/include/asm/unistd.h
diff --git a/include/asm-mn10300/user.h → arch/mn10300/include/asm/user.h b/include/asm-mn10300/user.h → arch/mn10300/include/asm/user.h
diff --git a/include/asm-mn10300/vga.h → arch/mn10300/include/asm/vga.h b/include/asm-mn10300/vga.h → arch/mn10300/include/asm/vga.h
diff --git a/include/asm-mn10300/xor.h → arch/mn10300/include/asm/xor.h b/include/asm-mn10300/xor.h → arch/mn10300/include/asm/xor.h
diff --git a/arch/mn10300/kernel/entry.S b/arch/mn10300/kernel/entry.S
@@ -20,7 +20,7 @@
 #include <asm/intctl-regs.h>
 #include <asm/busctl-regs.h>
 #include <asm/timer-regs.h>
-#include <asm/unit/leds.h>
+#include <unit/leds.h>
 #include <asm/page.h>
 #include <asm/pgtable.h>
 #include <asm/errno.h>

diff --git a/arch/mn10300/kernel/gdb-io-serial-low.S b/arch/mn10300/kernel/gdb-io-serial-low.S
@@ -18,7 +18,7 @@
 #include <asm/thread_info.h>
 #include <asm/frame.inc>
 #include <asm/intctl-regs.h>
-#include <asm/unit/serial.h>
+#include <unit/serial.h>
 
 	.text
 

diff --git a/arch/mn10300/kernel/gdb-io-serial.c b/arch/mn10300/kernel/gdb-io-serial.c
@@ -22,7 +22,7 @@
 #include <asm/gdb-stub.h>
 #include <asm/exceptions.h>
 #include <asm/serial-regs.h>
-#include <asm/unit/serial.h>
+#include <unit/serial.h>
 
 /*
  * initialise the GDB stub

diff --git a/arch/mn10300/kernel/gdb-io-ttysm-low.S b/arch/mn10300/kernel/gdb-io-ttysm-low.S
@@ -18,7 +18,7 @@
 #include <asm/cpu-regs.h>
 #include <asm/frame.inc>
 #include <asm/intctl-regs.h>
-#include <asm/unit/serial.h>
+#include <unit/serial.h>
 #include "mn10300-serial.h"
 
 	.text

diff --git a/arch/mn10300/kernel/gdb-io-ttysm.c b/arch/mn10300/kernel/gdb-io-ttysm.c
@@ -20,7 +20,7 @@
 #include <asm/system.h>
 #include <asm/gdb-stub.h>
 #include <asm/exceptions.h>
-#include <asm/unit/clock.h>
+#include <unit/clock.h>
 #include "mn10300-serial.h"
 
 #if defined(CONFIG_GDBSTUB_ON_TTYSM0)

diff --git a/arch/mn10300/kernel/gdb-stub.c b/arch/mn10300/kernel/gdb-stub.c
@@ -136,8 +136,8 @@
 #include <asm/cacheflush.h>
 #include <asm/serial-regs.h>
 #include <asm/busctl-regs.h>
-#include <asm/unit/leds.h>
-#include <asm/unit/serial.h>
+#include <unit/leds.h>
+#include <unit/serial.h>
 
 /* define to use F7F7 rather than FF which is subverted by JTAG debugger */
 #undef GDBSTUB_USE_F7F7_AS_BREAKPOINT

diff --git a/arch/mn10300/kernel/head.S b/arch/mn10300/kernel/head.S
@@ -17,7 +17,7 @@
 #include <asm/pgtable.h>
 #include <asm/frame.inc>
 #include <asm/param.h>
-#include <asm/unit/serial.h>
+#include <unit/serial.h>
 
 	.section .text.head,"ax"
 

diff --git a/arch/mn10300/kernel/mn10300-serial-low.S b/arch/mn10300/kernel/mn10300-serial-low.S
@@ -18,8 +18,8 @@
 #include <asm/cpu-regs.h>
 #include <asm/frame.inc>
 #include <asm/timer-regs.h>
-#include <asm/proc/cache.h>
-#include <asm/unit/timex.h>
+#include <proc/cache.h>
+#include <unit/timex.h>
 #include "mn10300-serial.h"
 
 #define	SCxCTR	0x00

diff --git a/arch/mn10300/kernel/mn10300-serial.c b/arch/mn10300/kernel/mn10300-serial.c
@@ -41,7 +41,7 @@ static const char serial_revdate[] = "2007-11-06";
 #include <asm/irq.h>
 #include <asm/bitops.h>
 #include <asm/serial-regs.h>
-#include <asm/unit/timex.h>
+#include <unit/timex.h>
 #include "mn10300-serial.h"
 
 static inline __attribute__((format(printf, 1, 2)))

diff --git a/arch/mn10300/kernel/mn10300-watchdog.c b/arch/mn10300/kernel/mn10300-watchdog.c
@@ -25,7 +25,7 @@
 #include <asm/div64.h>
 #include <asm/smp.h>
 #include <asm/gdb-stub.h>
-#include <asm/proc/clock.h>
+#include <proc/clock.h>
 
 static DEFINE_SPINLOCK(watchdog_print_lock);
 static unsigned int watchdog;

diff --git a/arch/mn10300/kernel/setup.c b/arch/mn10300/kernel/setup.c
@@ -30,7 +30,7 @@
 #include <asm/setup.h>
 #include <asm/io.h>
 #include <asm/smp.h>
-#include <asm/proc/proc.h>
+#include <proc/proc.h>
 #include <asm/busctl-regs.h>
 #include <asm/fpu.h>
 #include <asm/sections.h>

diff --git a/arch/mn10300/kernel/traps.c b/arch/mn10300/kernel/traps.c
@@ -37,7 +37,7 @@
 #include <asm/cacheflush.h>
 #include <asm/cpu-regs.h>
 #include <asm/busctl-regs.h>
-#include <asm/unit/leds.h>
+#include <unit/leds.h>
 #include <asm/fpu.h>
 #include <asm/gdb-stub.h>
 #include <asm/sections.h>

diff --git a/include/asm-mn10300/proc-mn103e010/cache.h → ...10300/proc-mn103e010/include/proc/cache.h b/include/asm-mn10300/proc-mn103e010/cache.h → ...10300/proc-mn103e010/include/proc/cache.h
diff --git a/include/asm-mn10300/proc-mn103e010/clock.h → ...10300/proc-mn103e010/include/proc/clock.h b/include/asm-mn10300/proc-mn103e010/clock.h → ...10300/proc-mn103e010/include/proc/clock.h
@@ -11,7 +11,7 @@
 #ifndef _ASM_PROC_CLOCK_H
 #define _ASM_PROC_CLOCK_H
 
-#include <asm/unit/clock.h>
+#include <unit/clock.h>
 
 #define MN10300_WDCLK		MN10300_IOCLK
 

diff --git a/include/asm-mn10300/proc-mn103e010/irq.h → ...mn10300/proc-mn103e010/include/proc/irq.h b/include/asm-mn10300/proc-mn103e010/irq.h → ...mn10300/proc-mn103e010/include/proc/irq.h
diff --git a/include/asm-mn10300/proc-mn103e010/proc.h → ...n10300/proc-mn103e010/include/proc/proc.h b/include/asm-mn10300/proc-mn103e010/proc.h → ...n10300/proc-mn103e010/include/proc/proc.h
diff --git a/include/asm-mn10300/unit-asb2303/clock.h → ...mn10300/unit-asb2303/include/unit/clock.h b/include/asm-mn10300/unit-asb2303/clock.h → ...mn10300/unit-asb2303/include/unit/clock.h
diff --git a/include/asm-mn10300/unit-asb2303/leds.h → .../mn10300/unit-asb2303/include/unit/leds.h b/include/asm-mn10300/unit-asb2303/leds.h → .../mn10300/unit-asb2303/include/unit/leds.h
diff --git a/include/asm-mn10300/unit-asb2303/serial.h → ...n10300/unit-asb2303/include/unit/serial.h b/include/asm-mn10300/unit-asb2303/serial.h → ...n10300/unit-asb2303/include/unit/serial.h
@@ -13,7 +13,7 @@
 #define _ASM_UNIT_SERIAL_H
 
 #include <asm/cpu-regs.h>
-#include <asm/proc/irq.h>
+#include <proc/irq.h>
 #include <linux/serial_reg.h>
 
 #define SERIAL_PORT0_BASE_ADDRESS	0xA6FB0000

diff --git a/include/asm-mn10300/unit-asb2303/smc91111.h → ...0300/unit-asb2303/include/unit/smc91111.h b/include/asm-mn10300/unit-asb2303/smc91111.h → ...0300/unit-asb2303/include/unit/smc91111.h
diff --git a/include/asm-mn10300/unit-asb2303/timex.h → ...mn10300/unit-asb2303/include/unit/timex.h b/include/asm-mn10300/unit-asb2303/timex.h → ...mn10300/unit-asb2303/include/unit/timex.h
@@ -16,7 +16,7 @@
 #endif /* __ASSEMBLY__ */
 
 #include <asm/timer-regs.h>
-#include <asm/unit/clock.h>
+#include <unit/clock.h>
 
 /*
  * jiffies counter specifications

diff --git a/arch/mn10300/unit-asb2303/leds.c b/arch/mn10300/unit-asb2303/leds.c
@@ -16,7 +16,7 @@
 #include <asm/processor.h>
 #include <asm/intctl-regs.h>
 #include <asm/rtc-regs.h>
-#include <asm/unit/leds.h>
+#include <unit/leds.h>
 
 #if 0
 static const u8 asb2303_led_hex_tbl[16] = {

diff --git a/arch/mn10300/unit-asb2303/smc91111.c b/arch/mn10300/unit-asb2303/smc91111.c
@@ -18,7 +18,7 @@
 #include <asm/timex.h>
 #include <asm/processor.h>
 #include <asm/intctl-regs.h>
-#include <asm/unit/smc91111.h>
+#include <unit/smc91111.h>
 
 static struct resource smc91c111_resources[] = {
 	[0] = {

diff --git a/include/asm-mn10300/unit-asb2305/clock.h → ...mn10300/unit-asb2305/include/unit/clock.h b/include/asm-mn10300/unit-asb2305/clock.h → ...mn10300/unit-asb2305/include/unit/clock.h
diff --git a/include/asm-mn10300/unit-asb2305/leds.h → .../mn10300/unit-asb2305/include/unit/leds.h b/include/asm-mn10300/unit-asb2305/leds.h → .../mn10300/unit-asb2305/include/unit/leds.h
diff --git a/include/asm-mn10300/unit-asb2305/serial.h → ...n10300/unit-asb2305/include/unit/serial.h b/include/asm-mn10300/unit-asb2305/serial.h → ...n10300/unit-asb2305/include/unit/serial.h
@@ -12,7 +12,7 @@
 #define _ASM_UNIT_SERIAL_H
 
 #include <asm/cpu/cpu-regs.h>
-#include <asm/proc/irq.h>
+#include <proc/irq.h>
 #include <linux/serial_reg.h>
 
 #define SERIAL_PORT0_BASE_ADDRESS	0xA6FB0000

diff --git a/include/asm-mn10300/unit-asb2305/timex.h → ...mn10300/unit-asb2305/include/unit/timex.h b/include/asm-mn10300/unit-asb2305/timex.h → ...mn10300/unit-asb2305/include/unit/timex.h
@@ -16,7 +16,7 @@
 #endif /* __ASSEMBLY__ */
 
 #include <asm/cpu/timer-regs.h>
-#include <asm/unit/clock.h>
+#include <unit/clock.h>
 
 /*
  * jiffies counter specifications

diff --git a/arch/mn10300/unit-asb2305/leds.c b/arch/mn10300/unit-asb2305/leds.c
@@ -15,7 +15,7 @@
 #include <asm/processor.h>
 #include <asm/cpu/intctl-regs.h>
 #include <asm/cpu/rtc-regs.h>
-#include <asm/unit/leds.h>
+#include <unit/leds.h>
 
 static const u8 asb2305_led_hex_tbl[16] = {
 	0x80, 0xf2, 0x48, 0x60, 0x32, 0x24, 0x04, 0xf0,

diff --git a/arch/mn10300/unit-asb2305/unit-init.c b/arch/mn10300/unit-asb2305/unit-init.c
@@ -18,7 +18,7 @@
 #include <asm/cpu/intctl-regs.h>
 #include <asm/cpu/rtc-regs.h>
 #include <asm/cpu/serial-regs.h>
-#include <asm/unit/serial.h>
+#include <unit/serial.h>
 
 /*
  * initialise some of the unit hardware before gdbstub is set up

diff --git a/drivers/net/smc91x.h b/drivers/net/smc91x.h
@@ -369,7 +369,7 @@ static inline void LPD7_SMC_outsw (unsigned char* a, int r,
  * MN10300/AM33 configuration
  */
 
-#include <asm/unit/smc91111.h>
+#include <unit/smc91111.h>
 
 #else