From 49148020bcb6910ce71417bd990a5ce7017f9bd3 Mon Sep 17 00:00:00 2001
From: Sam Ravnborg <sam@ravnborg.org>
Date: Fri, 16 Jan 2009 21:58:10 +1000
Subject: [PATCH] m68k,m68knommu: merge header files

Merge header files for m68k and m68knommu to the single location:

    arch/m68k/include/asm

The majority of this patch was the result of the
script that is included in the changelog below.

The script was originally written by Arnd Bergman and
exten by me to cover a few more files.

When the header files differed the script uses the following:

The original m68k file is named <file>_mm.h  [mm for memory manager]
The m68knommu file is named <file>_no.h [no for no memory manager]

The files uses the following include guard:

This include gaurd works as the m68knommu toolchain set
the __uClinux__ symbol - so this should work in userspace too.

Merging the header files for m68k and m68knommu exposes the
(unexpected?) ABI differences thus it is easier to actually
identify these and thus to fix them.

The commit has been build tested with both a m68k and
a m68knommu toolchain - with success.

The commit has also been tested with "make headers_check"
and this patch fixes make headers_check for m68knommu.

The script used:
TARGET=arch/m68k/include/asm
SOURCE=arch/m68knommu/include/asm

INCLUDE="cachectl.h errno.h fcntl.h hwtest.h ioctls.h ipcbuf.h \
linkage.h math-emu.h md.h mman.h movs.h msgbuf.h openprom.h \
oplib.h poll.h posix_types.h resource.h rtc.h sembuf.h shmbuf.h \
shm.h shmparam.h socket.h sockios.h spinlock.h statfs.h stat.h \
termbits.h termios.h tlb.h types.h user.h"

EQUAL="auxvec.h cputime.h device.h emergency-restart.h futex.h \
ioctl.h irq_regs.h kdebug.h local.h mutex.h percpu.h \
sections.h topology.h"

NOMUUFILES="anchor.h bootstd.h coldfire.h commproc.h dbg.h \
elia.h flat.h m5206sim.h m520xsim.h m523xsim.h m5249sim.h \
m5272sim.h m527xsim.h m528xsim.h m5307sim.h m532xsim.h \
m5407sim.h m68360_enet.h m68360.h m68360_pram.h m68360_quicc.h \
m68360_regs.h MC68328.h MC68332.h MC68EZ328.h MC68VZ328.h \
mcfcache.h mcfdma.h mcfmbus.h mcfne.h mcfpci.h mcfpit.h \
mcfsim.h mcfsmc.h mcftimer.h mcfuart.h mcfwdebug.h \
nettel.h quicc_simple.h smp.h"

FILES="atomic.h bitops.h bootinfo.h bug.h bugs.h byteorder.h cache.h \
cacheflush.h checksum.h current.h delay.h div64.h \
dma-mapping.h dma.h elf.h entry.h fb.h fpu.h hardirq.h hw_irq.h io.h \
irq.h kmap_types.h machdep.h mc146818rtc.h mmu.h mmu_context.h \
module.h page.h page_offset.h param.h pci.h pgalloc.h \
pgtable.h processor.h ptrace.h scatterlist.h segment.h \
setup.h sigcontext.h siginfo.h signal.h string.h system.h swab.h \
thread_info.h timex.h tlbflush.h traps.h uaccess.h ucontext.h \
unaligned.h unistd.h"

mergefile() {
	BASE=${1%.h}
	git mv ${SOURCE}/$1 ${TARGET}/${BASE}_no.h
	git mv ${TARGET}/$1 ${TARGET}/${BASE}_mm.h

cat << EOF > ${TARGET}/$1
EOF

	git add ${TARGET}/$1
}

set -e

mkdir -p ${TARGET}

git mv include/asm-m68k/* ${TARGET}
rmdir include/asm-m68k

git rm ${SOURCE}/Kbuild
for F in $INCLUDE $EQUAL; do
	git rm ${SOURCE}/$F
done

for F in $NOMUUFILES; do
	git mv ${SOURCE}/$F ${TARGET}/$F
done

for F in $FILES ; do
	mergefile $F
done

rmdir arch/m68knommu/include/asm
rmdir arch/m68knommu/include

Cc: Arnd Bergmann <arnd@arndb.de>
Cc: Geert Uytterhoeven <geert@linux-m68k.org>
Signed-off-by: Sam Ravnborg <sam@ravnborg.org>
Signed-off-by: Greg Ungerer <gerg@uclinux.org>
---
 Makefile                                                         | 4 ++++
 {include/asm-m68k => arch/m68k/include/asm}/Kbuild               | 0
 arch/{m68knommu => m68k}/include/asm/MC68328.h                   | 0
 arch/{m68knommu => m68k}/include/asm/MC68332.h                   | 0
 arch/{m68knommu => m68k}/include/asm/MC68EZ328.h                 | 0
 arch/{m68knommu => m68k}/include/asm/MC68VZ328.h                 | 0
 {include/asm-m68k => arch/m68k/include/asm}/a.out-core.h         | 0
 {include/asm-m68k => arch/m68k/include/asm}/a.out.h              | 0
 {include/asm-m68k => arch/m68k/include/asm}/adb_iop.h            | 0
 {include/asm-m68k => arch/m68k/include/asm}/amigahw.h            | 0
 {include/asm-m68k => arch/m68k/include/asm}/amigaints.h          | 0
 {include/asm-m68k => arch/m68k/include/asm}/amigayle.h           | 0
 {include/asm-m68k => arch/m68k/include/asm}/amipcmcia.h          | 0
 arch/{m68knommu => m68k}/include/asm/anchor.h                    | 0
 {include/asm-m68k => arch/m68k/include/asm}/apollodma.h          | 0
 {include/asm-m68k => arch/m68k/include/asm}/apollohw.h           | 0
 {include/asm-m68k => arch/m68k/include/asm}/atafd.h              | 0
 {include/asm-m68k => arch/m68k/include/asm}/atafdreg.h           | 0
 {include/asm-m68k => arch/m68k/include/asm}/atari_joystick.h     | 0
 {include/asm-m68k => arch/m68k/include/asm}/atari_stdma.h        | 0
 {include/asm-m68k => arch/m68k/include/asm}/atari_stram.h        | 0
 {include/asm-m68k => arch/m68k/include/asm}/atarihw.h            | 0
 {include/asm-m68k => arch/m68k/include/asm}/atariints.h          | 0
 {include/asm-m68k => arch/m68k/include/asm}/atarikb.h            | 0
 arch/m68k/include/asm/atomic.h                                   | 5 +++++
 include/asm-m68k/atomic.h => arch/m68k/include/asm/atomic_mm.h   | 0
 .../include/asm/atomic.h => m68k/include/asm/atomic_no.h}        | 0
 {include/asm-m68k => arch/m68k/include/asm}/auxvec.h             | 0
 arch/m68k/include/asm/bitops.h                                   | 5 +++++
 include/asm-m68k/bitops.h => arch/m68k/include/asm/bitops_mm.h   | 0
 .../include/asm/bitops.h => m68k/include/asm/bitops_no.h}        | 0
 {include/asm-m68k => arch/m68k/include/asm}/blinken.h            | 0
 arch/m68k/include/asm/bootinfo.h                                 | 5 +++++
 .../asm-m68k/bootinfo.h => arch/m68k/include/asm/bootinfo_mm.h   | 0
 .../include/asm/bootinfo.h => m68k/include/asm/bootinfo_no.h}    | 0
 arch/{m68knommu => m68k}/include/asm/bootstd.h                   | 0
 arch/m68k/include/asm/bug.h                                      | 5 +++++
 include/asm-m68k/bug.h => arch/m68k/include/asm/bug_mm.h         | 0
 arch/{m68knommu/include/asm/bug.h => m68k/include/asm/bug_no.h}  | 0
 arch/m68k/include/asm/bugs.h                                     | 5 +++++
 include/asm-m68k/bugs.h => arch/m68k/include/asm/bugs_mm.h       | 0
 .../{m68knommu/include/asm/bugs.h => m68k/include/asm/bugs_no.h} | 0
 {include/asm-m68k => arch/m68k/include/asm}/bvme6000hw.h         | 0
 arch/m68k/include/asm/byteorder.h                                | 5 +++++
 .../asm-m68k/byteorder.h => arch/m68k/include/asm/byteorder_mm.h | 0
 .../include/asm/byteorder.h => m68k/include/asm/byteorder_no.h}  | 0
 arch/m68k/include/asm/cache.h                                    | 5 +++++
 include/asm-m68k/cache.h => arch/m68k/include/asm/cache_mm.h     | 0
 .../include/asm/cache.h => m68k/include/asm/cache_no.h}          | 0
 {include/asm-m68k => arch/m68k/include/asm}/cachectl.h           | 0
 arch/m68k/include/asm/cacheflush.h                               | 5 +++++
 .../cacheflush.h => arch/m68k/include/asm/cacheflush_mm.h        | 0
 .../asm/cacheflush.h => m68k/include/asm/cacheflush_no.h}        | 0
 arch/m68k/include/asm/checksum.h                                 | 5 +++++
 .../asm-m68k/checksum.h => arch/m68k/include/asm/checksum_mm.h   | 0
 .../include/asm/checksum.h => m68k/include/asm/checksum_no.h}    | 0
 arch/{m68knommu => m68k}/include/asm/coldfire.h                  | 0
 arch/{m68knommu => m68k}/include/asm/commproc.h                  | 0
 {include/asm-m68k => arch/m68k/include/asm}/contregs.h           | 0
 {include/asm-m68k => arch/m68k/include/asm}/cputime.h            | 0
 arch/m68k/include/asm/current.h                                  | 5 +++++
 include/asm-m68k/current.h => arch/m68k/include/asm/current_mm.h | 0
 .../include/asm/current.h => m68k/include/asm/current_no.h}      | 0
 arch/{m68knommu => m68k}/include/asm/dbg.h                       | 0
 arch/m68k/include/asm/delay.h                                    | 5 +++++
 include/asm-m68k/delay.h => arch/m68k/include/asm/delay_mm.h     | 0
 .../include/asm/delay.h => m68k/include/asm/delay_no.h}          | 0
 {include/asm-m68k => arch/m68k/include/asm}/device.h             | 0
 arch/m68k/include/asm/div64.h                                    | 5 +++++
 include/asm-m68k/div64.h => arch/m68k/include/asm/div64_mm.h     | 0
 .../include/asm/div64.h => m68k/include/asm/div64_no.h}          | 0
 arch/m68k/include/asm/dma-mapping.h                              | 5 +++++
 .../dma-mapping.h => arch/m68k/include/asm/dma-mapping_mm.h      | 0
 .../asm/dma-mapping.h => m68k/include/asm/dma-mapping_no.h}      | 0
 arch/m68k/include/asm/dma.h                                      | 5 +++++
 include/asm-m68k/dma.h => arch/m68k/include/asm/dma_mm.h         | 0
 arch/{m68knommu/include/asm/dma.h => m68k/include/asm/dma_no.h}  | 0
 {include/asm-m68k => arch/m68k/include/asm}/dsp56k.h             | 0
 {include/asm-m68k => arch/m68k/include/asm}/dvma.h               | 0
 arch/m68k/include/asm/elf.h                                      | 5 +++++
 include/asm-m68k/elf.h => arch/m68k/include/asm/elf_mm.h         | 0
 arch/{m68knommu/include/asm/elf.h => m68k/include/asm/elf_no.h}  | 0
 arch/{m68knommu => m68k}/include/asm/elia.h                      | 0
 {include/asm-m68k => arch/m68k/include/asm}/emergency-restart.h  | 0
 arch/m68k/include/asm/entry.h                                    | 5 +++++
 include/asm-m68k/entry.h => arch/m68k/include/asm/entry_mm.h     | 0
 .../include/asm/entry.h => m68k/include/asm/entry_no.h}          | 0
 {include/asm-m68k => arch/m68k/include/asm}/errno.h              | 0
 arch/m68k/include/asm/fb.h                                       | 5 +++++
 include/asm-m68k/fb.h => arch/m68k/include/asm/fb_mm.h           | 0
 arch/{m68knommu/include/asm/fb.h => m68k/include/asm/fb_no.h}    | 0
 {include/asm-m68k => arch/m68k/include/asm}/fbio.h               | 0
 {include/asm-m68k => arch/m68k/include/asm}/fcntl.h              | 0
 arch/{m68knommu => m68k}/include/asm/flat.h                      | 0
 {include/asm-m68k => arch/m68k/include/asm}/floppy.h             | 0
 arch/m68k/include/asm/fpu.h                                      | 5 +++++
 include/asm-m68k/fpu.h => arch/m68k/include/asm/fpu_mm.h         | 0
 arch/{m68knommu/include/asm/fpu.h => m68k/include/asm/fpu_no.h}  | 0
 {include/asm-m68k => arch/m68k/include/asm}/futex.h              | 0
 arch/m68k/include/asm/hardirq.h                                  | 5 +++++
 include/asm-m68k/hardirq.h => arch/m68k/include/asm/hardirq_mm.h | 0
 .../include/asm/hardirq.h => m68k/include/asm/hardirq_no.h}      | 0
 {include/asm-m68k => arch/m68k/include/asm}/hp300hw.h            | 0
 arch/m68k/include/asm/hw_irq.h                                   | 5 +++++
 include/asm-m68k/hw_irq.h => arch/m68k/include/asm/hw_irq_mm.h   | 0
 .../include/asm/hw_irq.h => m68k/include/asm/hw_irq_no.h}        | 0
 {include/asm-m68k => arch/m68k/include/asm}/hwtest.h             | 0
 {include/asm-m68k => arch/m68k/include/asm}/ide.h                | 0
 {include/asm-m68k => arch/m68k/include/asm}/idprom.h             | 0
 {include/asm-m68k => arch/m68k/include/asm}/intersil.h           | 0
 arch/m68k/include/asm/io.h                                       | 5 +++++
 include/asm-m68k/io.h => arch/m68k/include/asm/io_mm.h           | 0
 arch/{m68knommu/include/asm/io.h => m68k/include/asm/io_no.h}    | 0
 {include/asm-m68k => arch/m68k/include/asm}/ioctl.h              | 0
 {include/asm-m68k => arch/m68k/include/asm}/ioctls.h             | 0
 {include/asm-m68k => arch/m68k/include/asm}/ipcbuf.h             | 0
 arch/m68k/include/asm/irq.h                                      | 5 +++++
 include/asm-m68k/irq.h => arch/m68k/include/asm/irq_mm.h         | 0
 arch/{m68knommu/include/asm/irq.h => m68k/include/asm/irq_no.h}  | 0
 {include/asm-m68k => arch/m68k/include/asm}/irq_regs.h           | 0
 {include/asm-m68k => arch/m68k/include/asm}/kdebug.h             | 0
 arch/m68k/include/asm/kmap_types.h                               | 5 +++++
 .../kmap_types.h => arch/m68k/include/asm/kmap_types_mm.h        | 0
 .../asm/kmap_types.h => m68k/include/asm/kmap_types_no.h}        | 0
 {include/asm-m68k => arch/m68k/include/asm}/linkage.h            | 0
 {include/asm-m68k => arch/m68k/include/asm}/local.h              | 0
 arch/{m68knommu => m68k}/include/asm/m5206sim.h                  | 0
 arch/{m68knommu => m68k}/include/asm/m520xsim.h                  | 0
 arch/{m68knommu => m68k}/include/asm/m523xsim.h                  | 0
 arch/{m68knommu => m68k}/include/asm/m5249sim.h                  | 0
 arch/{m68knommu => m68k}/include/asm/m5272sim.h                  | 0
 arch/{m68knommu => m68k}/include/asm/m527xsim.h                  | 0
 arch/{m68knommu => m68k}/include/asm/m528xsim.h                  | 0
 arch/{m68knommu => m68k}/include/asm/m5307sim.h                  | 0
 arch/{m68knommu => m68k}/include/asm/m532xsim.h                  | 0
 arch/{m68knommu => m68k}/include/asm/m5407sim.h                  | 0
 arch/{m68knommu => m68k}/include/asm/m68360.h                    | 0
 arch/{m68knommu => m68k}/include/asm/m68360_enet.h               | 0
 arch/{m68knommu => m68k}/include/asm/m68360_pram.h               | 0
 arch/{m68knommu => m68k}/include/asm/m68360_quicc.h              | 0
 arch/{m68knommu => m68k}/include/asm/m68360_regs.h               | 0
 {include/asm-m68k => arch/m68k/include/asm}/mac_asc.h            | 0
 {include/asm-m68k => arch/m68k/include/asm}/mac_baboon.h         | 0
 {include/asm-m68k => arch/m68k/include/asm}/mac_iop.h            | 0
 {include/asm-m68k => arch/m68k/include/asm}/mac_mouse.h          | 0
 {include/asm-m68k => arch/m68k/include/asm}/mac_oss.h            | 0
 {include/asm-m68k => arch/m68k/include/asm}/mac_psc.h            | 0
 {include/asm-m68k => arch/m68k/include/asm}/mac_via.h            | 0
 arch/m68k/include/asm/machdep.h                                  | 5 +++++
 include/asm-m68k/machdep.h => arch/m68k/include/asm/machdep_mm.h | 0
 .../include/asm/machdep.h => m68k/include/asm/machdep_no.h}      | 0
 {include/asm-m68k => arch/m68k/include/asm}/machines.h           | 0
 {include/asm-m68k => arch/m68k/include/asm}/machw.h              | 0
 {include/asm-m68k => arch/m68k/include/asm}/macintosh.h          | 0
 {include/asm-m68k => arch/m68k/include/asm}/macints.h            | 0
 {include/asm-m68k => arch/m68k/include/asm}/math-emu.h           | 0
 arch/m68k/include/asm/mc146818rtc.h                              | 5 +++++
 .../mc146818rtc.h => arch/m68k/include/asm/mc146818rtc_mm.h      | 0
 .../asm/mc146818rtc.h => m68k/include/asm/mc146818rtc_no.h}      | 0
 arch/{m68knommu => m68k}/include/asm/mcfcache.h                  | 0
 arch/{m68knommu => m68k}/include/asm/mcfdma.h                    | 0
 arch/{m68knommu => m68k}/include/asm/mcfmbus.h                   | 0
 arch/{m68knommu => m68k}/include/asm/mcfne.h                     | 0
 arch/{m68knommu => m68k}/include/asm/mcfpci.h                    | 0
 arch/{m68knommu => m68k}/include/asm/mcfpit.h                    | 0
 arch/{m68knommu => m68k}/include/asm/mcfsim.h                    | 0
 arch/{m68knommu => m68k}/include/asm/mcfsmc.h                    | 0
 arch/{m68knommu => m68k}/include/asm/mcftimer.h                  | 0
 arch/{m68knommu => m68k}/include/asm/mcfuart.h                   | 0
 arch/{m68knommu => m68k}/include/asm/mcfwdebug.h                 | 0
 {include/asm-m68k => arch/m68k/include/asm}/md.h                 | 0
 {include/asm-m68k => arch/m68k/include/asm}/mman.h               | 0
 arch/m68k/include/asm/mmu.h                                      | 5 +++++
 arch/m68k/include/asm/mmu_context.h                              | 5 +++++
 .../mmu_context.h => arch/m68k/include/asm/mmu_context_mm.h      | 0
 .../asm/mmu_context.h => m68k/include/asm/mmu_context_no.h}      | 0
 include/asm-m68k/mmu.h => arch/m68k/include/asm/mmu_mm.h         | 0
 arch/{m68knommu/include/asm/mmu.h => m68k/include/asm/mmu_no.h}  | 0
 {include/asm-m68k => arch/m68k/include/asm}/mmzone.h             | 0
 arch/m68k/include/asm/module.h                                   | 5 +++++
 include/asm-m68k/module.h => arch/m68k/include/asm/module_mm.h   | 0
 .../include/asm/module.h => m68k/include/asm/module_no.h}        | 0
 {include/asm-m68k => arch/m68k/include/asm}/motorola_pgalloc.h   | 0
 {include/asm-m68k => arch/m68k/include/asm}/motorola_pgtable.h   | 0
 {include/asm-m68k => arch/m68k/include/asm}/movs.h               | 0
 {include/asm-m68k => arch/m68k/include/asm}/msgbuf.h             | 0
 {include/asm-m68k => arch/m68k/include/asm}/mutex.h              | 0
 {include/asm-m68k => arch/m68k/include/asm}/mvme147hw.h          | 0
 {include/asm-m68k => arch/m68k/include/asm}/mvme16xhw.h          | 0
 arch/{m68knommu => m68k}/include/asm/nettel.h                    | 0
 {include/asm-m68k => arch/m68k/include/asm}/nubus.h              | 0
 {include/asm-m68k => arch/m68k/include/asm}/openprom.h           | 0
 {include/asm-m68k => arch/m68k/include/asm}/oplib.h              | 0
 arch/m68k/include/asm/page.h                                     | 5 +++++
 include/asm-m68k/page.h => arch/m68k/include/asm/page_mm.h       | 0
 .../{m68knommu/include/asm/page.h => m68k/include/asm/page_no.h} | 0
 arch/m68k/include/asm/page_offset.h                              | 5 +++++
 .../page_offset.h => arch/m68k/include/asm/page_offset_mm.h      | 0
 .../asm/page_offset.h => m68k/include/asm/page_offset_no.h}      | 0
 arch/m68k/include/asm/param.h                                    | 5 +++++
 include/asm-m68k/param.h => arch/m68k/include/asm/param_mm.h     | 0
 .../include/asm/param.h => m68k/include/asm/param_no.h}          | 0
 {include/asm-m68k => arch/m68k/include/asm}/parport.h            | 0
 arch/m68k/include/asm/pci.h                                      | 5 +++++
 include/asm-m68k/pci.h => arch/m68k/include/asm/pci_mm.h         | 0
 arch/{m68knommu/include/asm/pci.h => m68k/include/asm/pci_no.h}  | 2 +-
 {include/asm-m68k => arch/m68k/include/asm}/percpu.h             | 0
 arch/m68k/include/asm/pgalloc.h                                  | 5 +++++
 include/asm-m68k/pgalloc.h => arch/m68k/include/asm/pgalloc_mm.h | 0
 .../include/asm/pgalloc.h => m68k/include/asm/pgalloc_no.h}      | 0
 arch/m68k/include/asm/pgtable.h                                  | 5 +++++
 include/asm-m68k/pgtable.h => arch/m68k/include/asm/pgtable_mm.h | 0
 .../include/asm/pgtable.h => m68k/include/asm/pgtable_no.h}      | 0
 {include/asm-m68k => arch/m68k/include/asm}/poll.h               | 0
 {include/asm-m68k => arch/m68k/include/asm}/posix_types.h        | 0
 arch/m68k/include/asm/processor.h                                | 5 +++++
 .../asm-m68k/processor.h => arch/m68k/include/asm/processor_mm.h | 0
 .../include/asm/processor.h => m68k/include/asm/processor_no.h}  | 0
 arch/m68k/include/asm/ptrace.h                                   | 5 +++++
 include/asm-m68k/ptrace.h => arch/m68k/include/asm/ptrace_mm.h   | 0
 .../include/asm/ptrace.h => m68k/include/asm/ptrace_no.h}        | 0
 {include/asm-m68k => arch/m68k/include/asm}/q40_master.h         | 0
 {include/asm-m68k => arch/m68k/include/asm}/q40ints.h            | 0
 arch/{m68knommu => m68k}/include/asm/quicc_simple.h              | 0
 {include/asm-m68k => arch/m68k/include/asm}/raw_io.h             | 0
 {include/asm-m68k => arch/m68k/include/asm}/resource.h           | 0
 {include/asm-m68k => arch/m68k/include/asm}/rtc.h                | 0
 {include/asm-m68k => arch/m68k/include/asm}/sbus.h               | 0
 arch/m68k/include/asm/scatterlist.h                              | 5 +++++
 .../scatterlist.h => arch/m68k/include/asm/scatterlist_mm.h      | 0
 .../asm/scatterlist.h => m68k/include/asm/scatterlist_no.h}      | 0
 {include/asm-m68k => arch/m68k/include/asm}/sections.h           | 0
 arch/m68k/include/asm/segment.h                                  | 5 +++++
 include/asm-m68k/segment.h => arch/m68k/include/asm/segment_mm.h | 0
 .../include/asm/segment.h => m68k/include/asm/segment_no.h}      | 0
 {include/asm-m68k => arch/m68k/include/asm}/sembuf.h             | 0
 {include/asm-m68k => arch/m68k/include/asm}/serial.h             | 0
 arch/m68k/include/asm/setup.h                                    | 5 +++++
 include/asm-m68k/setup.h => arch/m68k/include/asm/setup_mm.h     | 0
 .../include/asm/setup.h => m68k/include/asm/setup_no.h}          | 2 +-
 {include/asm-m68k => arch/m68k/include/asm}/shm.h                | 0
 {include/asm-m68k => arch/m68k/include/asm}/shmbuf.h             | 0
 {include/asm-m68k => arch/m68k/include/asm}/shmparam.h           | 0
 arch/m68k/include/asm/sigcontext.h                               | 5 +++++
 .../sigcontext.h => arch/m68k/include/asm/sigcontext_mm.h        | 0
 .../asm/sigcontext.h => m68k/include/asm/sigcontext_no.h}        | 0
 arch/m68k/include/asm/siginfo.h                                  | 5 +++++
 include/asm-m68k/siginfo.h => arch/m68k/include/asm/siginfo_mm.h | 0
 .../include/asm/siginfo.h => m68k/include/asm/siginfo_no.h}      | 0
 arch/m68k/include/asm/signal.h                                   | 5 +++++
 include/asm-m68k/signal.h => arch/m68k/include/asm/signal_mm.h   | 0
 .../include/asm/signal.h => m68k/include/asm/signal_no.h}        | 0
 arch/{m68knommu => m68k}/include/asm/smp.h                       | 0
 {include/asm-m68k => arch/m68k/include/asm}/socket.h             | 0
 {include/asm-m68k => arch/m68k/include/asm}/sockios.h            | 0
 {include/asm-m68k => arch/m68k/include/asm}/spinlock.h           | 0
 {include/asm-m68k => arch/m68k/include/asm}/stat.h               | 0
 {include/asm-m68k => arch/m68k/include/asm}/statfs.h             | 0
 arch/m68k/include/asm/string.h                                   | 5 +++++
 include/asm-m68k/string.h => arch/m68k/include/asm/string_mm.h   | 0
 .../include/asm/string.h => m68k/include/asm/string_no.h}        | 0
 {include/asm-m68k => arch/m68k/include/asm}/sun3-head.h          | 0
 {include/asm-m68k => arch/m68k/include/asm}/sun3_pgalloc.h       | 0
 {include/asm-m68k => arch/m68k/include/asm}/sun3_pgtable.h       | 0
 {include/asm-m68k => arch/m68k/include/asm}/sun3ints.h           | 0
 {include/asm-m68k => arch/m68k/include/asm}/sun3mmu.h            | 0
 {include/asm-m68k => arch/m68k/include/asm}/sun3x.h              | 0
 {include/asm-m68k => arch/m68k/include/asm}/sun3xflop.h          | 0
 {include/asm-m68k => arch/m68k/include/asm}/sun3xprom.h          | 0
 {include/asm-m68k => arch/m68k/include/asm}/suspend.h            | 0
 arch/m68k/include/asm/swab.h                                     | 0
 include/asm-m68k/swab.h => arch/m68k/include/asm/swab_mm.h       | 0
 .../{m68knommu/include/asm/swab.h => m68k/include/asm/swab_no.h} | 0
 arch/m68k/include/asm/system.h                                   | 5 +++++
 include/asm-m68k/system.h => arch/m68k/include/asm/system_mm.h   | 0
 .../include/asm/system.h => m68k/include/asm/system_no.h}        | 0
 {include/asm-m68k => arch/m68k/include/asm}/termbits.h           | 0
 {include/asm-m68k => arch/m68k/include/asm}/termios.h            | 0
 arch/m68k/include/asm/thread_info.h                              | 5 +++++
 .../thread_info.h => arch/m68k/include/asm/thread_info_mm.h      | 0
 .../asm/thread_info.h => m68k/include/asm/thread_info_no.h}      | 0
 arch/m68k/include/asm/timex.h                                    | 5 +++++
 include/asm-m68k/timex.h => arch/m68k/include/asm/timex_mm.h     | 0
 .../include/asm/timex.h => m68k/include/asm/timex_no.h}          | 0
 {include/asm-m68k => arch/m68k/include/asm}/tlb.h                | 0
 arch/m68k/include/asm/tlbflush.h                                 | 5 +++++
 .../asm-m68k/tlbflush.h => arch/m68k/include/asm/tlbflush_mm.h   | 0
 .../include/asm/tlbflush.h => m68k/include/asm/tlbflush_no.h}    | 0
 {include/asm-m68k => arch/m68k/include/asm}/topology.h           | 0
 arch/m68k/include/asm/traps.h                                    | 5 +++++
 include/asm-m68k/traps.h => arch/m68k/include/asm/traps_mm.h     | 0
 .../include/asm/traps.h => m68k/include/asm/traps_no.h}          | 0
 {include/asm-m68k => arch/m68k/include/asm}/types.h              | 0
 arch/m68k/include/asm/uaccess.h                                  | 5 +++++
 include/asm-m68k/uaccess.h => arch/m68k/include/asm/uaccess_mm.h | 0
 .../include/asm/uaccess.h => m68k/include/asm/uaccess_no.h}      | 0
 arch/m68k/include/asm/ucontext.h                                 | 5 +++++
 .../asm-m68k/ucontext.h => arch/m68k/include/asm/ucontext_mm.h   | 0
 .../include/asm/ucontext.h => m68k/include/asm/ucontext_no.h}    | 0
 arch/m68k/include/asm/unaligned.h                                | 5 +++++
 .../asm-m68k/unaligned.h => arch/m68k/include/asm/unaligned_mm.h | 0
 .../include/asm/unaligned.h => m68k/include/asm/unaligned_no.h}  | 0
 arch/m68k/include/asm/unistd.h                                   | 5 +++++
 include/asm-m68k/unistd.h => arch/m68k/include/asm/unistd_mm.h   | 0
 .../include/asm/unistd.h => m68k/include/asm/unistd_no.h}        | 0
 {include/asm-m68k => arch/m68k/include/asm}/user.h               | 0
 {include/asm-m68k => arch/m68k/include/asm}/virtconvert.h        | 0
 {include/asm-m68k => arch/m68k/include/asm}/xor.h                | 0
 {include/asm-m68k => arch/m68k/include/asm}/zorro.h              | 0
 arch/m68knommu/include/asm/Kbuild                                | 3 ---
 arch/m68knommu/include/asm/auxvec.h                              | 4 ----
 arch/m68knommu/include/asm/cachectl.h                            | 1 -
 arch/m68knommu/include/asm/cputime.h                             | 6 ------
 arch/m68knommu/include/asm/device.h                              | 7 -------
 arch/m68knommu/include/asm/emergency-restart.h                   | 6 ------
 arch/m68knommu/include/asm/errno.h                               | 1 -
 arch/m68knommu/include/asm/fcntl.h                               | 1 -
 arch/m68knommu/include/asm/futex.h                               | 6 ------
 arch/m68knommu/include/asm/hwtest.h                              | 1 -
 arch/m68knommu/include/asm/ioctl.h                               | 1 -
 arch/m68knommu/include/asm/ioctls.h                              | 1 -
 arch/m68knommu/include/asm/ipcbuf.h                              | 1 -
 arch/m68knommu/include/asm/irq_regs.h                            | 1 -
 arch/m68knommu/include/asm/kdebug.h                              | 1 -
 arch/m68knommu/include/asm/linkage.h                             | 1 -
 arch/m68knommu/include/asm/local.h                               | 6 ------
 arch/m68knommu/include/asm/math-emu.h                            | 1 -
 arch/m68knommu/include/asm/md.h                                  | 1 -
 arch/m68knommu/include/asm/mman.h                                | 1 -
 arch/m68knommu/include/asm/movs.h                                | 1 -
 arch/m68knommu/include/asm/msgbuf.h                              | 1 -
 arch/m68knommu/include/asm/mutex.h                               | 9 ---------
 arch/m68knommu/include/asm/openprom.h                            | 1 -
 arch/m68knommu/include/asm/oplib.h                               | 1 -
 arch/m68knommu/include/asm/percpu.h                              | 6 ------
 arch/m68knommu/include/asm/poll.h                                | 1 -
 arch/m68knommu/include/asm/posix_types.h                         | 1 -
 arch/m68knommu/include/asm/resource.h                            | 1 -
 arch/m68knommu/include/asm/rtc.h                                 | 1 -
 arch/m68knommu/include/asm/sections.h                            | 7 -------
 arch/m68knommu/include/asm/sembuf.h                              | 1 -
 arch/m68knommu/include/asm/shm.h                                 | 1 -
 arch/m68knommu/include/asm/shmbuf.h                              | 1 -
 arch/m68knommu/include/asm/shmparam.h                            | 1 -
 arch/m68knommu/include/asm/socket.h                              | 1 -
 arch/m68knommu/include/asm/sockios.h                             | 1 -
 arch/m68knommu/include/asm/spinlock.h                            | 1 -
 arch/m68knommu/include/asm/stat.h                                | 1 -
 arch/m68knommu/include/asm/statfs.h                              | 1 -
 arch/m68knommu/include/asm/termbits.h                            | 1 -
 arch/m68knommu/include/asm/termios.h                             | 1 -
 arch/m68knommu/include/asm/tlb.h                                 | 1 -
 arch/m68knommu/include/asm/topology.h                            | 6 ------
 arch/m68knommu/include/asm/types.h                               | 1 -
 arch/m68knommu/include/asm/user.h                                | 1 -
 355 files changed, 266 insertions(+), 103 deletions(-)
 rename {include/asm-m68k => arch/m68k/include/asm}/Kbuild (100%)
 rename arch/{m68knommu => m68k}/include/asm/MC68328.h (100%)
 rename arch/{m68knommu => m68k}/include/asm/MC68332.h (100%)
 rename arch/{m68knommu => m68k}/include/asm/MC68EZ328.h (100%)
 rename arch/{m68knommu => m68k}/include/asm/MC68VZ328.h (100%)
 rename {include/asm-m68k => arch/m68k/include/asm}/a.out-core.h (100%)
 rename {include/asm-m68k => arch/m68k/include/asm}/a.out.h (100%)
 rename {include/asm-m68k => arch/m68k/include/asm}/adb_iop.h (100%)
 rename {include/asm-m68k => arch/m68k/include/asm}/amigahw.h (100%)
 rename {include/asm-m68k => arch/m68k/include/asm}/amigaints.h (100%)
 rename {include/asm-m68k => arch/m68k/include/asm}/amigayle.h (100%)
 rename {include/asm-m68k => arch/m68k/include/asm}/amipcmcia.h (100%)
 rename arch/{m68knommu => m68k}/include/asm/anchor.h (100%)
 rename {include/asm-m68k => arch/m68k/include/asm}/apollodma.h (100%)
 rename {include/asm-m68k => arch/m68k/include/asm}/apollohw.h (100%)
 rename {include/asm-m68k => arch/m68k/include/asm}/atafd.h (100%)
 rename {include/asm-m68k => arch/m68k/include/asm}/atafdreg.h (100%)
 rename {include/asm-m68k => arch/m68k/include/asm}/atari_joystick.h (100%)
 rename {include/asm-m68k => arch/m68k/include/asm}/atari_stdma.h (100%)
 rename {include/asm-m68k => arch/m68k/include/asm}/atari_stram.h (100%)
 rename {include/asm-m68k => arch/m68k/include/asm}/atarihw.h (100%)
 rename {include/asm-m68k => arch/m68k/include/asm}/atariints.h (100%)
 rename {include/asm-m68k => arch/m68k/include/asm}/atarikb.h (100%)
 create mode 100644 arch/m68k/include/asm/atomic.h
 rename include/asm-m68k/atomic.h => arch/m68k/include/asm/atomic_mm.h (100%)
 rename arch/{m68knommu/include/asm/atomic.h => m68k/include/asm/atomic_no.h} (100%)
 rename {include/asm-m68k => arch/m68k/include/asm}/auxvec.h (100%)
 create mode 100644 arch/m68k/include/asm/bitops.h
 rename include/asm-m68k/bitops.h => arch/m68k/include/asm/bitops_mm.h (100%)
 rename arch/{m68knommu/include/asm/bitops.h => m68k/include/asm/bitops_no.h} (100%)
 rename {include/asm-m68k => arch/m68k/include/asm}/blinken.h (100%)
 create mode 100644 arch/m68k/include/asm/bootinfo.h
 rename include/asm-m68k/bootinfo.h => arch/m68k/include/asm/bootinfo_mm.h (100%)
 rename arch/{m68knommu/include/asm/bootinfo.h => m68k/include/asm/bootinfo_no.h} (100%)
 rename arch/{m68knommu => m68k}/include/asm/bootstd.h (100%)
 create mode 100644 arch/m68k/include/asm/bug.h
 rename include/asm-m68k/bug.h => arch/m68k/include/asm/bug_mm.h (100%)
 rename arch/{m68knommu/include/asm/bug.h => m68k/include/asm/bug_no.h} (100%)
 create mode 100644 arch/m68k/include/asm/bugs.h
 rename include/asm-m68k/bugs.h => arch/m68k/include/asm/bugs_mm.h (100%)
 rename arch/{m68knommu/include/asm/bugs.h => m68k/include/asm/bugs_no.h} (100%)
 rename {include/asm-m68k => arch/m68k/include/asm}/bvme6000hw.h (100%)
 create mode 100644 arch/m68k/include/asm/byteorder.h
 rename include/asm-m68k/byteorder.h => arch/m68k/include/asm/byteorder_mm.h (100%)
 rename arch/{m68knommu/include/asm/byteorder.h => m68k/include/asm/byteorder_no.h} (100%)
 create mode 100644 arch/m68k/include/asm/cache.h
 rename include/asm-m68k/cache.h => arch/m68k/include/asm/cache_mm.h (100%)
 rename arch/{m68knommu/include/asm/cache.h => m68k/include/asm/cache_no.h} (100%)
 rename {include/asm-m68k => arch/m68k/include/asm}/cachectl.h (100%)
 create mode 100644 arch/m68k/include/asm/cacheflush.h
 rename include/asm-m68k/cacheflush.h => arch/m68k/include/asm/cacheflush_mm.h (100%)
 rename arch/{m68knommu/include/asm/cacheflush.h => m68k/include/asm/cacheflush_no.h} (100%)
 create mode 100644 arch/m68k/include/asm/checksum.h
 rename include/asm-m68k/checksum.h => arch/m68k/include/asm/checksum_mm.h (100%)
 rename arch/{m68knommu/include/asm/checksum.h => m68k/include/asm/checksum_no.h} (100%)
 rename arch/{m68knommu => m68k}/include/asm/coldfire.h (100%)
 rename arch/{m68knommu => m68k}/include/asm/commproc.h (100%)
 rename {include/asm-m68k => arch/m68k/include/asm}/contregs.h (100%)
 rename {include/asm-m68k => arch/m68k/include/asm}/cputime.h (100%)
 create mode 100644 arch/m68k/include/asm/current.h
 rename include/asm-m68k/current.h => arch/m68k/include/asm/current_mm.h (100%)
 rename arch/{m68knommu/include/asm/current.h => m68k/include/asm/current_no.h} (100%)
 rename arch/{m68knommu => m68k}/include/asm/dbg.h (100%)
 create mode 100644 arch/m68k/include/asm/delay.h
 rename include/asm-m68k/delay.h => arch/m68k/include/asm/delay_mm.h (100%)
 rename arch/{m68knommu/include/asm/delay.h => m68k/include/asm/delay_no.h} (100%)
 rename {include/asm-m68k => arch/m68k/include/asm}/device.h (100%)
 create mode 100644 arch/m68k/include/asm/div64.h
 rename include/asm-m68k/div64.h => arch/m68k/include/asm/div64_mm.h (100%)
 rename arch/{m68knommu/include/asm/div64.h => m68k/include/asm/div64_no.h} (100%)
 create mode 100644 arch/m68k/include/asm/dma-mapping.h
 rename include/asm-m68k/dma-mapping.h => arch/m68k/include/asm/dma-mapping_mm.h (100%)
 rename arch/{m68knommu/include/asm/dma-mapping.h => m68k/include/asm/dma-mapping_no.h} (100%)
 create mode 100644 arch/m68k/include/asm/dma.h
 rename include/asm-m68k/dma.h => arch/m68k/include/asm/dma_mm.h (100%)
 rename arch/{m68knommu/include/asm/dma.h => m68k/include/asm/dma_no.h} (100%)
 rename {include/asm-m68k => arch/m68k/include/asm}/dsp56k.h (100%)
 rename {include/asm-m68k => arch/m68k/include/asm}/dvma.h (100%)
 create mode 100644 arch/m68k/include/asm/elf.h
 rename include/asm-m68k/elf.h => arch/m68k/include/asm/elf_mm.h (100%)
 rename arch/{m68knommu/include/asm/elf.h => m68k/include/asm/elf_no.h} (100%)
 rename arch/{m68knommu => m68k}/include/asm/elia.h (100%)
 rename {include/asm-m68k => arch/m68k/include/asm}/emergency-restart.h (100%)
 create mode 100644 arch/m68k/include/asm/entry.h
 rename include/asm-m68k/entry.h => arch/m68k/include/asm/entry_mm.h (100%)
 rename arch/{m68knommu/include/asm/entry.h => m68k/include/asm/entry_no.h} (100%)
 rename {include/asm-m68k => arch/m68k/include/asm}/errno.h (100%)
 create mode 100644 arch/m68k/include/asm/fb.h
 rename include/asm-m68k/fb.h => arch/m68k/include/asm/fb_mm.h (100%)
 rename arch/{m68knommu/include/asm/fb.h => m68k/include/asm/fb_no.h} (100%)
 rename {include/asm-m68k => arch/m68k/include/asm}/fbio.h (100%)
 rename {include/asm-m68k => arch/m68k/include/asm}/fcntl.h (100%)
 rename arch/{m68knommu => m68k}/include/asm/flat.h (100%)
 rename {include/asm-m68k => arch/m68k/include/asm}/floppy.h (100%)
 create mode 100644 arch/m68k/include/asm/fpu.h
 rename include/asm-m68k/fpu.h => arch/m68k/include/asm/fpu_mm.h (100%)
 rename arch/{m68knommu/include/asm/fpu.h => m68k/include/asm/fpu_no.h} (100%)
 rename {include/asm-m68k => arch/m68k/include/asm}/futex.h (100%)
 create mode 100644 arch/m68k/include/asm/hardirq.h
 rename include/asm-m68k/hardirq.h => arch/m68k/include/asm/hardirq_mm.h (100%)
 rename arch/{m68knommu/include/asm/hardirq.h => m68k/include/asm/hardirq_no.h} (100%)
 rename {include/asm-m68k => arch/m68k/include/asm}/hp300hw.h (100%)
 create mode 100644 arch/m68k/include/asm/hw_irq.h
 rename include/asm-m68k/hw_irq.h => arch/m68k/include/asm/hw_irq_mm.h (100%)
 rename arch/{m68knommu/include/asm/hw_irq.h => m68k/include/asm/hw_irq_no.h} (100%)
 rename {include/asm-m68k => arch/m68k/include/asm}/hwtest.h (100%)
 rename {include/asm-m68k => arch/m68k/include/asm}/ide.h (100%)
 rename {include/asm-m68k => arch/m68k/include/asm}/idprom.h (100%)
 rename {include/asm-m68k => arch/m68k/include/asm}/intersil.h (100%)
 create mode 100644 arch/m68k/include/asm/io.h
 rename include/asm-m68k/io.h => arch/m68k/include/asm/io_mm.h (100%)
 rename arch/{m68knommu/include/asm/io.h => m68k/include/asm/io_no.h} (100%)
 rename {include/asm-m68k => arch/m68k/include/asm}/ioctl.h (100%)
 rename {include/asm-m68k => arch/m68k/include/asm}/ioctls.h (100%)
 rename {include/asm-m68k => arch/m68k/include/asm}/ipcbuf.h (100%)
 create mode 100644 arch/m68k/include/asm/irq.h
 rename include/asm-m68k/irq.h => arch/m68k/include/asm/irq_mm.h (100%)
 rename arch/{m68knommu/include/asm/irq.h => m68k/include/asm/irq_no.h} (100%)
 rename {include/asm-m68k => arch/m68k/include/asm}/irq_regs.h (100%)
 rename {include/asm-m68k => arch/m68k/include/asm}/kdebug.h (100%)
 create mode 100644 arch/m68k/include/asm/kmap_types.h
 rename include/asm-m68k/kmap_types.h => arch/m68k/include/asm/kmap_types_mm.h (100%)
 rename arch/{m68knommu/include/asm/kmap_types.h => m68k/include/asm/kmap_types_no.h} (100%)
 rename {include/asm-m68k => arch/m68k/include/asm}/linkage.h (100%)
 rename {include/asm-m68k => arch/m68k/include/asm}/local.h (100%)
 rename arch/{m68knommu => m68k}/include/asm/m5206sim.h (100%)
 rename arch/{m68knommu => m68k}/include/asm/m520xsim.h (100%)
 rename arch/{m68knommu => m68k}/include/asm/m523xsim.h (100%)
 rename arch/{m68knommu => m68k}/include/asm/m5249sim.h (100%)
 rename arch/{m68knommu => m68k}/include/asm/m5272sim.h (100%)
 rename arch/{m68knommu => m68k}/include/asm/m527xsim.h (100%)
 rename arch/{m68knommu => m68k}/include/asm/m528xsim.h (100%)
 rename arch/{m68knommu => m68k}/include/asm/m5307sim.h (100%)
 rename arch/{m68knommu => m68k}/include/asm/m532xsim.h (100%)
 rename arch/{m68knommu => m68k}/include/asm/m5407sim.h (100%)
 rename arch/{m68knommu => m68k}/include/asm/m68360.h (100%)
 rename arch/{m68knommu => m68k}/include/asm/m68360_enet.h (100%)
 rename arch/{m68knommu => m68k}/include/asm/m68360_pram.h (100%)
 rename arch/{m68knommu => m68k}/include/asm/m68360_quicc.h (100%)
 rename arch/{m68knommu => m68k}/include/asm/m68360_regs.h (100%)
 rename {include/asm-m68k => arch/m68k/include/asm}/mac_asc.h (100%)
 rename {include/asm-m68k => arch/m68k/include/asm}/mac_baboon.h (100%)
 rename {include/asm-m68k => arch/m68k/include/asm}/mac_iop.h (100%)
 rename {include/asm-m68k => arch/m68k/include/asm}/mac_mouse.h (100%)
 rename {include/asm-m68k => arch/m68k/include/asm}/mac_oss.h (100%)
 rename {include/asm-m68k => arch/m68k/include/asm}/mac_psc.h (100%)
 rename {include/asm-m68k => arch/m68k/include/asm}/mac_via.h (100%)
 create mode 100644 arch/m68k/include/asm/machdep.h
 rename include/asm-m68k/machdep.h => arch/m68k/include/asm/machdep_mm.h (100%)
 rename arch/{m68knommu/include/asm/machdep.h => m68k/include/asm/machdep_no.h} (100%)
 rename {include/asm-m68k => arch/m68k/include/asm}/machines.h (100%)
 rename {include/asm-m68k => arch/m68k/include/asm}/machw.h (100%)
 rename {include/asm-m68k => arch/m68k/include/asm}/macintosh.h (100%)
 rename {include/asm-m68k => arch/m68k/include/asm}/macints.h (100%)
 rename {include/asm-m68k => arch/m68k/include/asm}/math-emu.h (100%)
 create mode 100644 arch/m68k/include/asm/mc146818rtc.h
 rename include/asm-m68k/mc146818rtc.h => arch/m68k/include/asm/mc146818rtc_mm.h (100%)
 rename arch/{m68knommu/include/asm/mc146818rtc.h => m68k/include/asm/mc146818rtc_no.h} (100%)
 rename arch/{m68knommu => m68k}/include/asm/mcfcache.h (100%)
 rename arch/{m68knommu => m68k}/include/asm/mcfdma.h (100%)
 rename arch/{m68knommu => m68k}/include/asm/mcfmbus.h (100%)
 rename arch/{m68knommu => m68k}/include/asm/mcfne.h (100%)
 rename arch/{m68knommu => m68k}/include/asm/mcfpci.h (100%)
 rename arch/{m68knommu => m68k}/include/asm/mcfpit.h (100%)
 rename arch/{m68knommu => m68k}/include/asm/mcfsim.h (100%)
 rename arch/{m68knommu => m68k}/include/asm/mcfsmc.h (100%)
 rename arch/{m68knommu => m68k}/include/asm/mcftimer.h (100%)
 rename arch/{m68knommu => m68k}/include/asm/mcfuart.h (100%)
 rename arch/{m68knommu => m68k}/include/asm/mcfwdebug.h (100%)
 rename {include/asm-m68k => arch/m68k/include/asm}/md.h (100%)
 rename {include/asm-m68k => arch/m68k/include/asm}/mman.h (100%)
 create mode 100644 arch/m68k/include/asm/mmu.h
 create mode 100644 arch/m68k/include/asm/mmu_context.h
 rename include/asm-m68k/mmu_context.h => arch/m68k/include/asm/mmu_context_mm.h (100%)
 rename arch/{m68knommu/include/asm/mmu_context.h => m68k/include/asm/mmu_context_no.h} (100%)
 rename include/asm-m68k/mmu.h => arch/m68k/include/asm/mmu_mm.h (100%)
 rename arch/{m68knommu/include/asm/mmu.h => m68k/include/asm/mmu_no.h} (100%)
 rename {include/asm-m68k => arch/m68k/include/asm}/mmzone.h (100%)
 create mode 100644 arch/m68k/include/asm/module.h
 rename include/asm-m68k/module.h => arch/m68k/include/asm/module_mm.h (100%)
 rename arch/{m68knommu/include/asm/module.h => m68k/include/asm/module_no.h} (100%)
 rename {include/asm-m68k => arch/m68k/include/asm}/motorola_pgalloc.h (100%)
 rename {include/asm-m68k => arch/m68k/include/asm}/motorola_pgtable.h (100%)
 rename {include/asm-m68k => arch/m68k/include/asm}/movs.h (100%)
 rename {include/asm-m68k => arch/m68k/include/asm}/msgbuf.h (100%)
 rename {include/asm-m68k => arch/m68k/include/asm}/mutex.h (100%)
 rename {include/asm-m68k => arch/m68k/include/asm}/mvme147hw.h (100%)
 rename {include/asm-m68k => arch/m68k/include/asm}/mvme16xhw.h (100%)
 rename arch/{m68knommu => m68k}/include/asm/nettel.h (100%)
 rename {include/asm-m68k => arch/m68k/include/asm}/nubus.h (100%)
 rename {include/asm-m68k => arch/m68k/include/asm}/openprom.h (100%)
 rename {include/asm-m68k => arch/m68k/include/asm}/oplib.h (100%)
 create mode 100644 arch/m68k/include/asm/page.h
 rename include/asm-m68k/page.h => arch/m68k/include/asm/page_mm.h (100%)
 rename arch/{m68knommu/include/asm/page.h => m68k/include/asm/page_no.h} (100%)
 create mode 100644 arch/m68k/include/asm/page_offset.h
 rename include/asm-m68k/page_offset.h => arch/m68k/include/asm/page_offset_mm.h (100%)
 rename arch/{m68knommu/include/asm/page_offset.h => m68k/include/asm/page_offset_no.h} (100%)
 create mode 100644 arch/m68k/include/asm/param.h
 rename include/asm-m68k/param.h => arch/m68k/include/asm/param_mm.h (100%)
 rename arch/{m68knommu/include/asm/param.h => m68k/include/asm/param_no.h} (100%)
 rename {include/asm-m68k => arch/m68k/include/asm}/parport.h (100%)
 create mode 100644 arch/m68k/include/asm/pci.h
 rename include/asm-m68k/pci.h => arch/m68k/include/asm/pci_mm.h (100%)
 rename arch/{m68knommu/include/asm/pci.h => m68k/include/asm/pci_no.h} (96%)
 rename {include/asm-m68k => arch/m68k/include/asm}/percpu.h (100%)
 create mode 100644 arch/m68k/include/asm/pgalloc.h
 rename include/asm-m68k/pgalloc.h => arch/m68k/include/asm/pgalloc_mm.h (100%)
 rename arch/{m68knommu/include/asm/pgalloc.h => m68k/include/asm/pgalloc_no.h} (100%)
 create mode 100644 arch/m68k/include/asm/pgtable.h
 rename include/asm-m68k/pgtable.h => arch/m68k/include/asm/pgtable_mm.h (100%)
 rename arch/{m68knommu/include/asm/pgtable.h => m68k/include/asm/pgtable_no.h} (100%)
 rename {include/asm-m68k => arch/m68k/include/asm}/poll.h (100%)
 rename {include/asm-m68k => arch/m68k/include/asm}/posix_types.h (100%)
 create mode 100644 arch/m68k/include/asm/processor.h
 rename include/asm-m68k/processor.h => arch/m68k/include/asm/processor_mm.h (100%)
 rename arch/{m68knommu/include/asm/processor.h => m68k/include/asm/processor_no.h} (100%)
 create mode 100644 arch/m68k/include/asm/ptrace.h
 rename include/asm-m68k/ptrace.h => arch/m68k/include/asm/ptrace_mm.h (100%)
 rename arch/{m68knommu/include/asm/ptrace.h => m68k/include/asm/ptrace_no.h} (100%)
 rename {include/asm-m68k => arch/m68k/include/asm}/q40_master.h (100%)
 rename {include/asm-m68k => arch/m68k/include/asm}/q40ints.h (100%)
 rename arch/{m68knommu => m68k}/include/asm/quicc_simple.h (100%)
 rename {include/asm-m68k => arch/m68k/include/asm}/raw_io.h (100%)
 rename {include/asm-m68k => arch/m68k/include/asm}/resource.h (100%)
 rename {include/asm-m68k => arch/m68k/include/asm}/rtc.h (100%)
 rename {include/asm-m68k => arch/m68k/include/asm}/sbus.h (100%)
 create mode 100644 arch/m68k/include/asm/scatterlist.h
 rename include/asm-m68k/scatterlist.h => arch/m68k/include/asm/scatterlist_mm.h (100%)
 rename arch/{m68knommu/include/asm/scatterlist.h => m68k/include/asm/scatterlist_no.h} (100%)
 rename {include/asm-m68k => arch/m68k/include/asm}/sections.h (100%)
 create mode 100644 arch/m68k/include/asm/segment.h
 rename include/asm-m68k/segment.h => arch/m68k/include/asm/segment_mm.h (100%)
 rename arch/{m68knommu/include/asm/segment.h => m68k/include/asm/segment_no.h} (100%)
 rename {include/asm-m68k => arch/m68k/include/asm}/sembuf.h (100%)
 rename {include/asm-m68k => arch/m68k/include/asm}/serial.h (100%)
 create mode 100644 arch/m68k/include/asm/setup.h
 rename include/asm-m68k/setup.h => arch/m68k/include/asm/setup_mm.h (100%)
 rename arch/{m68knommu/include/asm/setup.h => m68k/include/asm/setup_no.h} (84%)
 rename {include/asm-m68k => arch/m68k/include/asm}/shm.h (100%)
 rename {include/asm-m68k => arch/m68k/include/asm}/shmbuf.h (100%)
 rename {include/asm-m68k => arch/m68k/include/asm}/shmparam.h (100%)
 create mode 100644 arch/m68k/include/asm/sigcontext.h
 rename include/asm-m68k/sigcontext.h => arch/m68k/include/asm/sigcontext_mm.h (100%)
 rename arch/{m68knommu/include/asm/sigcontext.h => m68k/include/asm/sigcontext_no.h} (100%)
 create mode 100644 arch/m68k/include/asm/siginfo.h
 rename include/asm-m68k/siginfo.h => arch/m68k/include/asm/siginfo_mm.h (100%)
 rename arch/{m68knommu/include/asm/siginfo.h => m68k/include/asm/siginfo_no.h} (100%)
 create mode 100644 arch/m68k/include/asm/signal.h
 rename include/asm-m68k/signal.h => arch/m68k/include/asm/signal_mm.h (100%)
 rename arch/{m68knommu/include/asm/signal.h => m68k/include/asm/signal_no.h} (100%)
 rename arch/{m68knommu => m68k}/include/asm/smp.h (100%)
 rename {include/asm-m68k => arch/m68k/include/asm}/socket.h (100%)
 rename {include/asm-m68k => arch/m68k/include/asm}/sockios.h (100%)
 rename {include/asm-m68k => arch/m68k/include/asm}/spinlock.h (100%)
 rename {include/asm-m68k => arch/m68k/include/asm}/stat.h (100%)
 rename {include/asm-m68k => arch/m68k/include/asm}/statfs.h (100%)
 create mode 100644 arch/m68k/include/asm/string.h
 rename include/asm-m68k/string.h => arch/m68k/include/asm/string_mm.h (100%)
 rename arch/{m68knommu/include/asm/string.h => m68k/include/asm/string_no.h} (100%)
 rename {include/asm-m68k => arch/m68k/include/asm}/sun3-head.h (100%)
 rename {include/asm-m68k => arch/m68k/include/asm}/sun3_pgalloc.h (100%)
 rename {include/asm-m68k => arch/m68k/include/asm}/sun3_pgtable.h (100%)
 rename {include/asm-m68k => arch/m68k/include/asm}/sun3ints.h (100%)
 rename {include/asm-m68k => arch/m68k/include/asm}/sun3mmu.h (100%)
 rename {include/asm-m68k => arch/m68k/include/asm}/sun3x.h (100%)
 rename {include/asm-m68k => arch/m68k/include/asm}/sun3xflop.h (100%)
 rename {include/asm-m68k => arch/m68k/include/asm}/sun3xprom.h (100%)
 rename {include/asm-m68k => arch/m68k/include/asm}/suspend.h (100%)
 create mode 100644 arch/m68k/include/asm/swab.h
 rename include/asm-m68k/swab.h => arch/m68k/include/asm/swab_mm.h (100%)
 rename arch/{m68knommu/include/asm/swab.h => m68k/include/asm/swab_no.h} (100%)
 create mode 100644 arch/m68k/include/asm/system.h
 rename include/asm-m68k/system.h => arch/m68k/include/asm/system_mm.h (100%)
 rename arch/{m68knommu/include/asm/system.h => m68k/include/asm/system_no.h} (100%)
 rename {include/asm-m68k => arch/m68k/include/asm}/termbits.h (100%)
 rename {include/asm-m68k => arch/m68k/include/asm}/termios.h (100%)
 create mode 100644 arch/m68k/include/asm/thread_info.h
 rename include/asm-m68k/thread_info.h => arch/m68k/include/asm/thread_info_mm.h (100%)
 rename arch/{m68knommu/include/asm/thread_info.h => m68k/include/asm/thread_info_no.h} (100%)
 create mode 100644 arch/m68k/include/asm/timex.h
 rename include/asm-m68k/timex.h => arch/m68k/include/asm/timex_mm.h (100%)
 rename arch/{m68knommu/include/asm/timex.h => m68k/include/asm/timex_no.h} (100%)
 rename {include/asm-m68k => arch/m68k/include/asm}/tlb.h (100%)
 create mode 100644 arch/m68k/include/asm/tlbflush.h
 rename include/asm-m68k/tlbflush.h => arch/m68k/include/asm/tlbflush_mm.h (100%)
 rename arch/{m68knommu/include/asm/tlbflush.h => m68k/include/asm/tlbflush_no.h} (100%)
 rename {include/asm-m68k => arch/m68k/include/asm}/topology.h (100%)
 create mode 100644 arch/m68k/include/asm/traps.h
 rename include/asm-m68k/traps.h => arch/m68k/include/asm/traps_mm.h (100%)
 rename arch/{m68knommu/include/asm/traps.h => m68k/include/asm/traps_no.h} (100%)
 rename {include/asm-m68k => arch/m68k/include/asm}/types.h (100%)
 create mode 100644 arch/m68k/include/asm/uaccess.h
 rename include/asm-m68k/uaccess.h => arch/m68k/include/asm/uaccess_mm.h (100%)
 rename arch/{m68knommu/include/asm/uaccess.h => m68k/include/asm/uaccess_no.h} (100%)
 create mode 100644 arch/m68k/include/asm/ucontext.h
 rename include/asm-m68k/ucontext.h => arch/m68k/include/asm/ucontext_mm.h (100%)
 rename arch/{m68knommu/include/asm/ucontext.h => m68k/include/asm/ucontext_no.h} (100%)
 create mode 100644 arch/m68k/include/asm/unaligned.h
 rename include/asm-m68k/unaligned.h => arch/m68k/include/asm/unaligned_mm.h (100%)
 rename arch/{m68knommu/include/asm/unaligned.h => m68k/include/asm/unaligned_no.h} (100%)
 create mode 100644 arch/m68k/include/asm/unistd.h
 rename include/asm-m68k/unistd.h => arch/m68k/include/asm/unistd_mm.h (100%)
 rename arch/{m68knommu/include/asm/unistd.h => m68k/include/asm/unistd_no.h} (100%)
 rename {include/asm-m68k => arch/m68k/include/asm}/user.h (100%)
 rename {include/asm-m68k => arch/m68k/include/asm}/virtconvert.h (100%)
 rename {include/asm-m68k => arch/m68k/include/asm}/xor.h (100%)
 rename {include/asm-m68k => arch/m68k/include/asm}/zorro.h (100%)
 delete mode 100644 arch/m68knommu/include/asm/Kbuild
 delete mode 100644 arch/m68knommu/include/asm/auxvec.h
 delete mode 100644 arch/m68knommu/include/asm/cachectl.h
 delete mode 100644 arch/m68knommu/include/asm/cputime.h
 delete mode 100644 arch/m68knommu/include/asm/device.h
 delete mode 100644 arch/m68knommu/include/asm/emergency-restart.h
 delete mode 100644 arch/m68knommu/include/asm/errno.h
 delete mode 100644 arch/m68knommu/include/asm/fcntl.h
 delete mode 100644 arch/m68knommu/include/asm/futex.h
 delete mode 100644 arch/m68knommu/include/asm/hwtest.h
 delete mode 100644 arch/m68knommu/include/asm/ioctl.h
 delete mode 100644 arch/m68knommu/include/asm/ioctls.h
 delete mode 100644 arch/m68knommu/include/asm/ipcbuf.h
 delete mode 100644 arch/m68knommu/include/asm/irq_regs.h
 delete mode 100644 arch/m68knommu/include/asm/kdebug.h
 delete mode 100644 arch/m68knommu/include/asm/linkage.h
 delete mode 100644 arch/m68knommu/include/asm/local.h
 delete mode 100644 arch/m68knommu/include/asm/math-emu.h
 delete mode 100644 arch/m68knommu/include/asm/md.h
 delete mode 100644 arch/m68knommu/include/asm/mman.h
 delete mode 100644 arch/m68knommu/include/asm/movs.h
 delete mode 100644 arch/m68knommu/include/asm/msgbuf.h
 delete mode 100644 arch/m68knommu/include/asm/mutex.h
 delete mode 100644 arch/m68knommu/include/asm/openprom.h
 delete mode 100644 arch/m68knommu/include/asm/oplib.h
 delete mode 100644 arch/m68knommu/include/asm/percpu.h
 delete mode 100644 arch/m68knommu/include/asm/poll.h
 delete mode 100644 arch/m68knommu/include/asm/posix_types.h
 delete mode 100644 arch/m68knommu/include/asm/resource.h
 delete mode 100644 arch/m68knommu/include/asm/rtc.h
 delete mode 100644 arch/m68knommu/include/asm/sections.h
 delete mode 100644 arch/m68knommu/include/asm/sembuf.h
 delete mode 100644 arch/m68knommu/include/asm/shm.h
 delete mode 100644 arch/m68knommu/include/asm/shmbuf.h
 delete mode 100644 arch/m68knommu/include/asm/shmparam.h
 delete mode 100644 arch/m68knommu/include/asm/socket.h
 delete mode 100644 arch/m68knommu/include/asm/sockios.h
 delete mode 100644 arch/m68knommu/include/asm/spinlock.h
 delete mode 100644 arch/m68knommu/include/asm/stat.h
 delete mode 100644 arch/m68knommu/include/asm/statfs.h
 delete mode 100644 arch/m68knommu/include/asm/termbits.h
 delete mode 100644 arch/m68knommu/include/asm/termios.h
 delete mode 100644 arch/m68knommu/include/asm/tlb.h
 delete mode 100644 arch/m68knommu/include/asm/topology.h
 delete mode 100644 arch/m68knommu/include/asm/types.h
 delete mode 100644 arch/m68knommu/include/asm/user.h

diff --git a/Makefile b/Makefile
index c06e250..bab7b84 100644
--- a/Makefile
+++ b/Makefile
@@ -213,6 +213,10 @@ endif
 # Where to locate arch specific headers
 hdr-arch  := $(SRCARCH)
 
+ifeq ($(ARCH),m68knommu)
+       hdr-arch  := m68k
+endif
+
 KCONFIG_CONFIG	?= .config
 
 # SHELL used by kbuild
diff --git a/include/asm-m68k/Kbuild b/arch/m68k/include/asm/Kbuild
similarity index 100%
rename from include/asm-m68k/Kbuild
rename to arch/m68k/include/asm/Kbuild
diff --git a/arch/m68knommu/include/asm/MC68328.h b/arch/m68k/include/asm/MC68328.h
similarity index 100%
rename from arch/m68knommu/include/asm/MC68328.h
rename to arch/m68k/include/asm/MC68328.h
diff --git a/arch/m68knommu/include/asm/MC68332.h b/arch/m68k/include/asm/MC68332.h
similarity index 100%
rename from arch/m68knommu/include/asm/MC68332.h
rename to arch/m68k/include/asm/MC68332.h
diff --git a/arch/m68knommu/include/asm/MC68EZ328.h b/arch/m68k/include/asm/MC68EZ328.h
similarity index 100%
rename from arch/m68knommu/include/asm/MC68EZ328.h
rename to arch/m68k/include/asm/MC68EZ328.h
diff --git a/arch/m68knommu/include/asm/MC68VZ328.h b/arch/m68k/include/asm/MC68VZ328.h
similarity index 100%
rename from arch/m68knommu/include/asm/MC68VZ328.h
rename to arch/m68k/include/asm/MC68VZ328.h
diff --git a/include/asm-m68k/a.out-core.h b/arch/m68k/include/asm/a.out-core.h
similarity index 100%
rename from include/asm-m68k/a.out-core.h
rename to arch/m68k/include/asm/a.out-core.h
diff --git a/include/asm-m68k/a.out.h b/arch/m68k/include/asm/a.out.h
similarity index 100%
rename from include/asm-m68k/a.out.h
rename to arch/m68k/include/asm/a.out.h
diff --git a/include/asm-m68k/adb_iop.h b/arch/m68k/include/asm/adb_iop.h
similarity index 100%
rename from include/asm-m68k/adb_iop.h
rename to arch/m68k/include/asm/adb_iop.h
diff --git a/include/asm-m68k/amigahw.h b/arch/m68k/include/asm/amigahw.h
similarity index 100%
rename from include/asm-m68k/amigahw.h
rename to arch/m68k/include/asm/amigahw.h
diff --git a/include/asm-m68k/amigaints.h b/arch/m68k/include/asm/amigaints.h
similarity index 100%
rename from include/asm-m68k/amigaints.h
rename to arch/m68k/include/asm/amigaints.h
diff --git a/include/asm-m68k/amigayle.h b/arch/m68k/include/asm/amigayle.h
similarity index 100%
rename from include/asm-m68k/amigayle.h
rename to arch/m68k/include/asm/amigayle.h
diff --git a/include/asm-m68k/amipcmcia.h b/arch/m68k/include/asm/amipcmcia.h
similarity index 100%
rename from include/asm-m68k/amipcmcia.h
rename to arch/m68k/include/asm/amipcmcia.h
diff --git a/arch/m68knommu/include/asm/anchor.h b/arch/m68k/include/asm/anchor.h
similarity index 100%
rename from arch/m68knommu/include/asm/anchor.h
rename to arch/m68k/include/asm/anchor.h
diff --git a/include/asm-m68k/apollodma.h b/arch/m68k/include/asm/apollodma.h
similarity index 100%
rename from include/asm-m68k/apollodma.h
rename to arch/m68k/include/asm/apollodma.h
diff --git a/include/asm-m68k/apollohw.h b/arch/m68k/include/asm/apollohw.h
similarity index 100%
rename from include/asm-m68k/apollohw.h
rename to arch/m68k/include/asm/apollohw.h
diff --git a/include/asm-m68k/atafd.h b/arch/m68k/include/asm/atafd.h
similarity index 100%
rename from include/asm-m68k/atafd.h
rename to arch/m68k/include/asm/atafd.h
diff --git a/include/asm-m68k/atafdreg.h b/arch/m68k/include/asm/atafdreg.h
similarity index 100%
rename from include/asm-m68k/atafdreg.h
rename to arch/m68k/include/asm/atafdreg.h
diff --git a/include/asm-m68k/atari_joystick.h b/arch/m68k/include/asm/atari_joystick.h
similarity index 100%
rename from include/asm-m68k/atari_joystick.h
rename to arch/m68k/include/asm/atari_joystick.h
diff --git a/include/asm-m68k/atari_stdma.h b/arch/m68k/include/asm/atari_stdma.h
similarity index 100%
rename from include/asm-m68k/atari_stdma.h
rename to arch/m68k/include/asm/atari_stdma.h
diff --git a/include/asm-m68k/atari_stram.h b/arch/m68k/include/asm/atari_stram.h
similarity index 100%
rename from include/asm-m68k/atari_stram.h
rename to arch/m68k/include/asm/atari_stram.h
diff --git a/include/asm-m68k/atarihw.h b/arch/m68k/include/asm/atarihw.h
similarity index 100%
rename from include/asm-m68k/atarihw.h
rename to arch/m68k/include/asm/atarihw.h
diff --git a/include/asm-m68k/atariints.h b/arch/m68k/include/asm/atariints.h
similarity index 100%
rename from include/asm-m68k/atariints.h
rename to arch/m68k/include/asm/atariints.h
diff --git a/include/asm-m68k/atarikb.h b/arch/m68k/include/asm/atarikb.h
similarity index 100%
rename from include/asm-m68k/atarikb.h
rename to arch/m68k/include/asm/atarikb.h
diff --git a/arch/m68k/include/asm/atomic.h b/arch/m68k/include/asm/atomic.h
new file mode 100644
index 0000000..8d29145
--- /dev/null
+++ b/arch/m68k/include/asm/atomic.h
@@ -0,0 +1,5 @@
+#ifdef __uClinux__
+#include "atomic_no.h"
+#else
+#include "atomic_mm.h"
+#endif
diff --git a/include/asm-m68k/atomic.h b/arch/m68k/include/asm/atomic_mm.h
similarity index 100%
rename from include/asm-m68k/atomic.h
rename to arch/m68k/include/asm/atomic_mm.h
diff --git a/arch/m68knommu/include/asm/atomic.h b/arch/m68k/include/asm/atomic_no.h
similarity index 100%
rename from arch/m68knommu/include/asm/atomic.h
rename to arch/m68k/include/asm/atomic_no.h
diff --git a/include/asm-m68k/auxvec.h b/arch/m68k/include/asm/auxvec.h
similarity index 100%
rename from include/asm-m68k/auxvec.h
rename to arch/m68k/include/asm/auxvec.h
diff --git a/arch/m68k/include/asm/bitops.h b/arch/m68k/include/asm/bitops.h
new file mode 100644
index 0000000..ce163ab
--- /dev/null
+++ b/arch/m68k/include/asm/bitops.h
@@ -0,0 +1,5 @@
+#ifdef __uClinux__
+#include "bitops_no.h"
+#else
+#include "bitops_mm.h"
+#endif
diff --git a/include/asm-m68k/bitops.h b/arch/m68k/include/asm/bitops_mm.h
similarity index 100%
rename from include/asm-m68k/bitops.h
rename to arch/m68k/include/asm/bitops_mm.h
diff --git a/arch/m68knommu/include/asm/bitops.h b/arch/m68k/include/asm/bitops_no.h
similarity index 100%
rename from arch/m68knommu/include/asm/bitops.h
rename to arch/m68k/include/asm/bitops_no.h
diff --git a/include/asm-m68k/blinken.h b/arch/m68k/include/asm/blinken.h
similarity index 100%
rename from include/asm-m68k/blinken.h
rename to arch/m68k/include/asm/blinken.h
diff --git a/arch/m68k/include/asm/bootinfo.h b/arch/m68k/include/asm/bootinfo.h
new file mode 100644
index 0000000..fedf3e3
--- /dev/null
+++ b/arch/m68k/include/asm/bootinfo.h
@@ -0,0 +1,5 @@
+#ifdef __uClinux__
+#include "bootinfo_no.h"
+#else
+#include "bootinfo_mm.h"
+#endif
diff --git a/include/asm-m68k/bootinfo.h b/arch/m68k/include/asm/bootinfo_mm.h
similarity index 100%
rename from include/asm-m68k/bootinfo.h
rename to arch/m68k/include/asm/bootinfo_mm.h
diff --git a/arch/m68knommu/include/asm/bootinfo.h b/arch/m68k/include/asm/bootinfo_no.h
similarity index 100%
rename from arch/m68knommu/include/asm/bootinfo.h
rename to arch/m68k/include/asm/bootinfo_no.h
diff --git a/arch/m68knommu/include/asm/bootstd.h b/arch/m68k/include/asm/bootstd.h
similarity index 100%
rename from arch/m68knommu/include/asm/bootstd.h
rename to arch/m68k/include/asm/bootstd.h
diff --git a/arch/m68k/include/asm/bug.h b/arch/m68k/include/asm/bug.h
new file mode 100644
index 0000000..997e094
--- /dev/null
+++ b/arch/m68k/include/asm/bug.h
@@ -0,0 +1,5 @@
+#ifdef __uClinux__
+#include "bug_no.h"
+#else
+#include "bug_mm.h"
+#endif
diff --git a/include/asm-m68k/bug.h b/arch/m68k/include/asm/bug_mm.h
similarity index 100%
rename from include/asm-m68k/bug.h
rename to arch/m68k/include/asm/bug_mm.h
diff --git a/arch/m68knommu/include/asm/bug.h b/arch/m68k/include/asm/bug_no.h
similarity index 100%
rename from arch/m68knommu/include/asm/bug.h
rename to arch/m68k/include/asm/bug_no.h
diff --git a/arch/m68k/include/asm/bugs.h b/arch/m68k/include/asm/bugs.h
new file mode 100644
index 0000000..01f047d
--- /dev/null
+++ b/arch/m68k/include/asm/bugs.h
@@ -0,0 +1,5 @@
+#ifdef __uClinux__
+#include "bugs_no.h"
+#else
+#include "bugs_mm.h"
+#endif
diff --git a/include/asm-m68k/bugs.h b/arch/m68k/include/asm/bugs_mm.h
similarity index 100%
rename from include/asm-m68k/bugs.h
rename to arch/m68k/include/asm/bugs_mm.h
diff --git a/arch/m68knommu/include/asm/bugs.h b/arch/m68k/include/asm/bugs_no.h
similarity index 100%
rename from arch/m68knommu/include/asm/bugs.h
rename to arch/m68k/include/asm/bugs_no.h
diff --git a/include/asm-m68k/bvme6000hw.h b/arch/m68k/include/asm/bvme6000hw.h
similarity index 100%
rename from include/asm-m68k/bvme6000hw.h
rename to arch/m68k/include/asm/bvme6000hw.h
diff --git a/arch/m68k/include/asm/byteorder.h b/arch/m68k/include/asm/byteorder.h
new file mode 100644
index 0000000..f20502a
--- /dev/null
+++ b/arch/m68k/include/asm/byteorder.h
@@ -0,0 +1,5 @@
+#ifdef __uClinux__
+#include "byteorder_no.h"
+#else
+#include "byteorder_mm.h"
+#endif
diff --git a/include/asm-m68k/byteorder.h b/arch/m68k/include/asm/byteorder_mm.h
similarity index 100%
rename from include/asm-m68k/byteorder.h
rename to arch/m68k/include/asm/byteorder_mm.h
diff --git a/arch/m68knommu/include/asm/byteorder.h b/arch/m68k/include/asm/byteorder_no.h
similarity index 100%
rename from arch/m68knommu/include/asm/byteorder.h
rename to arch/m68k/include/asm/byteorder_no.h
diff --git a/arch/m68k/include/asm/cache.h b/arch/m68k/include/asm/cache.h
new file mode 100644
index 0000000..599c29b
--- /dev/null
+++ b/arch/m68k/include/asm/cache.h
@@ -0,0 +1,5 @@
+#ifdef __uClinux__
+#include "cache_no.h"
+#else
+#include "cache_mm.h"
+#endif
diff --git a/include/asm-m68k/cache.h b/arch/m68k/include/asm/cache_mm.h
similarity index 100%
rename from include/asm-m68k/cache.h
rename to arch/m68k/include/asm/cache_mm.h
diff --git a/arch/m68knommu/include/asm/cache.h b/arch/m68k/include/asm/cache_no.h
similarity index 100%
rename from arch/m68knommu/include/asm/cache.h
rename to arch/m68k/include/asm/cache_no.h
diff --git a/include/asm-m68k/cachectl.h b/arch/m68k/include/asm/cachectl.h
similarity index 100%
rename from include/asm-m68k/cachectl.h
rename to arch/m68k/include/asm/cachectl.h
diff --git a/arch/m68k/include/asm/cacheflush.h b/arch/m68k/include/asm/cacheflush.h
new file mode 100644
index 0000000..a70d731
--- /dev/null
+++ b/arch/m68k/include/asm/cacheflush.h
@@ -0,0 +1,5 @@
+#ifdef __uClinux__
+#include "cacheflush_no.h"
+#else
+#include "cacheflush_mm.h"
+#endif
diff --git a/include/asm-m68k/cacheflush.h b/arch/m68k/include/asm/cacheflush_mm.h
similarity index 100%
rename from include/asm-m68k/cacheflush.h
rename to arch/m68k/include/asm/cacheflush_mm.h
diff --git a/arch/m68knommu/include/asm/cacheflush.h b/arch/m68k/include/asm/cacheflush_no.h
similarity index 100%
rename from arch/m68knommu/include/asm/cacheflush.h
rename to arch/m68k/include/asm/cacheflush_no.h
diff --git a/arch/m68k/include/asm/checksum.h b/arch/m68k/include/asm/checksum.h
new file mode 100644
index 0000000..1cf5447
--- /dev/null
+++ b/arch/m68k/include/asm/checksum.h
@@ -0,0 +1,5 @@
+#ifdef __uClinux__
+#include "checksum_no.h"
+#else
+#include "checksum_mm.h"
+#endif
diff --git a/include/asm-m68k/checksum.h b/arch/m68k/include/asm/checksum_mm.h
similarity index 100%
rename from include/asm-m68k/checksum.h
rename to arch/m68k/include/asm/checksum_mm.h
diff --git a/arch/m68knommu/include/asm/checksum.h b/arch/m68k/include/asm/checksum_no.h
similarity index 100%
rename from arch/m68knommu/include/asm/checksum.h
rename to arch/m68k/include/asm/checksum_no.h
diff --git a/arch/m68knommu/include/asm/coldfire.h b/arch/m68k/include/asm/coldfire.h
similarity index 100%
rename from arch/m68knommu/include/asm/coldfire.h
rename to arch/m68k/include/asm/coldfire.h
diff --git a/arch/m68knommu/include/asm/commproc.h b/arch/m68k/include/asm/commproc.h
similarity index 100%
rename from arch/m68knommu/include/asm/commproc.h
rename to arch/m68k/include/asm/commproc.h
diff --git a/include/asm-m68k/contregs.h b/arch/m68k/include/asm/contregs.h
similarity index 100%
rename from include/asm-m68k/contregs.h
rename to arch/m68k/include/asm/contregs.h
diff --git a/include/asm-m68k/cputime.h b/arch/m68k/include/asm/cputime.h
similarity index 100%
rename from include/asm-m68k/cputime.h
rename to arch/m68k/include/asm/cputime.h
diff --git a/arch/m68k/include/asm/current.h b/arch/m68k/include/asm/current.h
new file mode 100644
index 0000000..51b056d
--- /dev/null
+++ b/arch/m68k/include/asm/current.h
@@ -0,0 +1,5 @@
+#ifdef __uClinux__
+#include "current_no.h"
+#else
+#include "current_mm.h"
+#endif
diff --git a/include/asm-m68k/current.h b/arch/m68k/include/asm/current_mm.h
similarity index 100%
rename from include/asm-m68k/current.h
rename to arch/m68k/include/asm/current_mm.h
diff --git a/arch/m68knommu/include/asm/current.h b/arch/m68k/include/asm/current_no.h
similarity index 100%
rename from arch/m68knommu/include/asm/current.h
rename to arch/m68k/include/asm/current_no.h
diff --git a/arch/m68knommu/include/asm/dbg.h b/arch/m68k/include/asm/dbg.h
similarity index 100%
rename from arch/m68knommu/include/asm/dbg.h
rename to arch/m68k/include/asm/dbg.h
diff --git a/arch/m68k/include/asm/delay.h b/arch/m68k/include/asm/delay.h
new file mode 100644
index 0000000..d2598e3
--- /dev/null
+++ b/arch/m68k/include/asm/delay.h
@@ -0,0 +1,5 @@
+#ifdef __uClinux__
+#include "delay_no.h"
+#else
+#include "delay_mm.h"
+#endif
diff --git a/include/asm-m68k/delay.h b/arch/m68k/include/asm/delay_mm.h
similarity index 100%
rename from include/asm-m68k/delay.h
rename to arch/m68k/include/asm/delay_mm.h
diff --git a/arch/m68knommu/include/asm/delay.h b/arch/m68k/include/asm/delay_no.h
similarity index 100%
rename from arch/m68knommu/include/asm/delay.h
rename to arch/m68k/include/asm/delay_no.h
diff --git a/include/asm-m68k/device.h b/arch/m68k/include/asm/device.h
similarity index 100%
rename from include/asm-m68k/device.h
rename to arch/m68k/include/asm/device.h
diff --git a/arch/m68k/include/asm/div64.h b/arch/m68k/include/asm/div64.h
new file mode 100644
index 0000000..d211d9f
--- /dev/null
+++ b/arch/m68k/include/asm/div64.h
@@ -0,0 +1,5 @@
+#ifdef __uClinux__
+#include "div64_no.h"
+#else
+#include "div64_mm.h"
+#endif
diff --git a/include/asm-m68k/div64.h b/arch/m68k/include/asm/div64_mm.h
similarity index 100%
rename from include/asm-m68k/div64.h
rename to arch/m68k/include/asm/div64_mm.h
diff --git a/arch/m68knommu/include/asm/div64.h b/arch/m68k/include/asm/div64_no.h
similarity index 100%
rename from arch/m68knommu/include/asm/div64.h
rename to arch/m68k/include/asm/div64_no.h
diff --git a/arch/m68k/include/asm/dma-mapping.h b/arch/m68k/include/asm/dma-mapping.h
new file mode 100644
index 0000000..f4a4c76
--- /dev/null
+++ b/arch/m68k/include/asm/dma-mapping.h
@@ -0,0 +1,5 @@
+#ifdef __uClinux__
+#include "dma-mapping_no.h"
+#else
+#include "dma-mapping_mm.h"
+#endif
diff --git a/include/asm-m68k/dma-mapping.h b/arch/m68k/include/asm/dma-mapping_mm.h
similarity index 100%
rename from include/asm-m68k/dma-mapping.h
rename to arch/m68k/include/asm/dma-mapping_mm.h
diff --git a/arch/m68knommu/include/asm/dma-mapping.h b/arch/m68k/include/asm/dma-mapping_no.h
similarity index 100%
rename from arch/m68knommu/include/asm/dma-mapping.h
rename to arch/m68k/include/asm/dma-mapping_no.h
diff --git a/arch/m68k/include/asm/dma.h b/arch/m68k/include/asm/dma.h
new file mode 100644
index 0000000..b82e660
--- /dev/null
+++ b/arch/m68k/include/asm/dma.h
@@ -0,0 +1,5 @@
+#ifdef __uClinux__
+#include "dma_no.h"
+#else
+#include "dma_mm.h"
+#endif
diff --git a/include/asm-m68k/dma.h b/arch/m68k/include/asm/dma_mm.h
similarity index 100%
rename from include/asm-m68k/dma.h
rename to arch/m68k/include/asm/dma_mm.h
diff --git a/arch/m68knommu/include/asm/dma.h b/arch/m68k/include/asm/dma_no.h
similarity index 100%
rename from arch/m68knommu/include/asm/dma.h
rename to arch/m68k/include/asm/dma_no.h
diff --git a/include/asm-m68k/dsp56k.h b/arch/m68k/include/asm/dsp56k.h
similarity index 100%
rename from include/asm-m68k/dsp56k.h
rename to arch/m68k/include/asm/dsp56k.h
diff --git a/include/asm-m68k/dvma.h b/arch/m68k/include/asm/dvma.h
similarity index 100%
rename from include/asm-m68k/dvma.h
rename to arch/m68k/include/asm/dvma.h
diff --git a/arch/m68k/include/asm/elf.h b/arch/m68k/include/asm/elf.h
new file mode 100644
index 0000000..04ce488
--- /dev/null
+++ b/arch/m68k/include/asm/elf.h
@@ -0,0 +1,5 @@
+#ifdef __uClinux__
+#include "elf_no.h"
+#else
+#include "elf_mm.h"
+#endif
diff --git a/include/asm-m68k/elf.h b/arch/m68k/include/asm/elf_mm.h
similarity index 100%
rename from include/asm-m68k/elf.h
rename to arch/m68k/include/asm/elf_mm.h
diff --git a/arch/m68knommu/include/asm/elf.h b/arch/m68k/include/asm/elf_no.h
similarity index 100%
rename from arch/m68knommu/include/asm/elf.h
rename to arch/m68k/include/asm/elf_no.h
diff --git a/arch/m68knommu/include/asm/elia.h b/arch/m68k/include/asm/elia.h
similarity index 100%
rename from arch/m68knommu/include/asm/elia.h
rename to arch/m68k/include/asm/elia.h
diff --git a/include/asm-m68k/emergency-restart.h b/arch/m68k/include/asm/emergency-restart.h
similarity index 100%
rename from include/asm-m68k/emergency-restart.h
rename to arch/m68k/include/asm/emergency-restart.h
diff --git a/arch/m68k/include/asm/entry.h b/arch/m68k/include/asm/entry.h
new file mode 100644
index 0000000..876eec6
--- /dev/null
+++ b/arch/m68k/include/asm/entry.h
@@ -0,0 +1,5 @@
+#ifdef __uClinux__
+#include "entry_no.h"
+#else
+#include "entry_mm.h"
+#endif
diff --git a/include/asm-m68k/entry.h b/arch/m68k/include/asm/entry_mm.h
similarity index 100%
rename from include/asm-m68k/entry.h
rename to arch/m68k/include/asm/entry_mm.h
diff --git a/arch/m68knommu/include/asm/entry.h b/arch/m68k/include/asm/entry_no.h
similarity index 100%
rename from arch/m68knommu/include/asm/entry.h
rename to arch/m68k/include/asm/entry_no.h
diff --git a/include/asm-m68k/errno.h b/arch/m68k/include/asm/errno.h
similarity index 100%
rename from include/asm-m68k/errno.h
rename to arch/m68k/include/asm/errno.h
diff --git a/arch/m68k/include/asm/fb.h b/arch/m68k/include/asm/fb.h
new file mode 100644
index 0000000..97bcaef
--- /dev/null
+++ b/arch/m68k/include/asm/fb.h
@@ -0,0 +1,5 @@
+#ifdef __uClinux__
+#include "fb_no.h"
+#else
+#include "fb_mm.h"
+#endif
diff --git a/include/asm-m68k/fb.h b/arch/m68k/include/asm/fb_mm.h
similarity index 100%
rename from include/asm-m68k/fb.h
rename to arch/m68k/include/asm/fb_mm.h
diff --git a/arch/m68knommu/include/asm/fb.h b/arch/m68k/include/asm/fb_no.h
similarity index 100%
rename from arch/m68knommu/include/asm/fb.h
rename to arch/m68k/include/asm/fb_no.h
diff --git a/include/asm-m68k/fbio.h b/arch/m68k/include/asm/fbio.h
similarity index 100%
rename from include/asm-m68k/fbio.h
rename to arch/m68k/include/asm/fbio.h
diff --git a/include/asm-m68k/fcntl.h b/arch/m68k/include/asm/fcntl.h
similarity index 100%
rename from include/asm-m68k/fcntl.h
rename to arch/m68k/include/asm/fcntl.h
diff --git a/arch/m68knommu/include/asm/flat.h b/arch/m68k/include/asm/flat.h
similarity index 100%
rename from arch/m68knommu/include/asm/flat.h
rename to arch/m68k/include/asm/flat.h
diff --git a/include/asm-m68k/floppy.h b/arch/m68k/include/asm/floppy.h
similarity index 100%
rename from include/asm-m68k/floppy.h
rename to arch/m68k/include/asm/floppy.h
diff --git a/arch/m68k/include/asm/fpu.h b/arch/m68k/include/asm/fpu.h
new file mode 100644
index 0000000..e19bc5e
--- /dev/null
+++ b/arch/m68k/include/asm/fpu.h
@@ -0,0 +1,5 @@
+#ifdef __uClinux__
+#include "fpu_no.h"
+#else
+#include "fpu_mm.h"
+#endif
diff --git a/include/asm-m68k/fpu.h b/arch/m68k/include/asm/fpu_mm.h
similarity index 100%
rename from include/asm-m68k/fpu.h
rename to arch/m68k/include/asm/fpu_mm.h
diff --git a/arch/m68knommu/include/asm/fpu.h b/arch/m68k/include/asm/fpu_no.h
similarity index 100%
rename from arch/m68knommu/include/asm/fpu.h
rename to arch/m68k/include/asm/fpu_no.h
diff --git a/include/asm-m68k/futex.h b/arch/m68k/include/asm/futex.h
similarity index 100%
rename from include/asm-m68k/futex.h
rename to arch/m68k/include/asm/futex.h
diff --git a/arch/m68k/include/asm/hardirq.h b/arch/m68k/include/asm/hardirq.h
new file mode 100644
index 0000000..56d0d5d
--- /dev/null
+++ b/arch/m68k/include/asm/hardirq.h
@@ -0,0 +1,5 @@
+#ifdef __uClinux__
+#include "hardirq_no.h"
+#else
+#include "hardirq_mm.h"
+#endif
diff --git a/include/asm-m68k/hardirq.h b/arch/m68k/include/asm/hardirq_mm.h
similarity index 100%
rename from include/asm-m68k/hardirq.h
rename to arch/m68k/include/asm/hardirq_mm.h
diff --git a/arch/m68knommu/include/asm/hardirq.h b/arch/m68k/include/asm/hardirq_no.h
similarity index 100%
rename from arch/m68knommu/include/asm/hardirq.h
rename to arch/m68k/include/asm/hardirq_no.h
diff --git a/include/asm-m68k/hp300hw.h b/arch/m68k/include/asm/hp300hw.h
similarity index 100%
rename from include/asm-m68k/hp300hw.h
rename to arch/m68k/include/asm/hp300hw.h
diff --git a/arch/m68k/include/asm/hw_irq.h b/arch/m68k/include/asm/hw_irq.h
new file mode 100644
index 0000000..e195260
--- /dev/null
+++ b/arch/m68k/include/asm/hw_irq.h
@@ -0,0 +1,5 @@
+#ifdef __uClinux__
+#include "hw_irq_no.h"
+#else
+#include "hw_irq_mm.h"
+#endif
diff --git a/include/asm-m68k/hw_irq.h b/arch/m68k/include/asm/hw_irq_mm.h
similarity index 100%
rename from include/asm-m68k/hw_irq.h
rename to arch/m68k/include/asm/hw_irq_mm.h
diff --git a/arch/m68knommu/include/asm/hw_irq.h b/arch/m68k/include/asm/hw_irq_no.h
similarity index 100%
rename from arch/m68knommu/include/asm/hw_irq.h
rename to arch/m68k/include/asm/hw_irq_no.h
diff --git a/include/asm-m68k/hwtest.h b/arch/m68k/include/asm/hwtest.h
similarity index 100%
rename from include/asm-m68k/hwtest.h
rename to arch/m68k/include/asm/hwtest.h
diff --git a/include/asm-m68k/ide.h b/arch/m68k/include/asm/ide.h
similarity index 100%
rename from include/asm-m68k/ide.h
rename to arch/m68k/include/asm/ide.h
diff --git a/include/asm-m68k/idprom.h b/arch/m68k/include/asm/idprom.h
similarity index 100%
rename from include/asm-m68k/idprom.h
rename to arch/m68k/include/asm/idprom.h
diff --git a/include/asm-m68k/intersil.h b/arch/m68k/include/asm/intersil.h
similarity index 100%
rename from include/asm-m68k/intersil.h
rename to arch/m68k/include/asm/intersil.h
diff --git a/arch/m68k/include/asm/io.h b/arch/m68k/include/asm/io.h
new file mode 100644
index 0000000..c7210ba
--- /dev/null
+++ b/arch/m68k/include/asm/io.h
@@ -0,0 +1,5 @@
+#ifdef __uClinux__
+#include "io_no.h"
+#else
+#include "io_mm.h"
+#endif
diff --git a/include/asm-m68k/io.h b/arch/m68k/include/asm/io_mm.h
similarity index 100%
rename from include/asm-m68k/io.h
rename to arch/m68k/include/asm/io_mm.h
diff --git a/arch/m68knommu/include/asm/io.h b/arch/m68k/include/asm/io_no.h
similarity index 100%
rename from arch/m68knommu/include/asm/io.h
rename to arch/m68k/include/asm/io_no.h
diff --git a/include/asm-m68k/ioctl.h b/arch/m68k/include/asm/ioctl.h
similarity index 100%
rename from include/asm-m68k/ioctl.h
rename to arch/m68k/include/asm/ioctl.h
diff --git a/include/asm-m68k/ioctls.h b/arch/m68k/include/asm/ioctls.h
similarity index 100%
rename from include/asm-m68k/ioctls.h
rename to arch/m68k/include/asm/ioctls.h
diff --git a/include/asm-m68k/ipcbuf.h b/arch/m68k/include/asm/ipcbuf.h
similarity index 100%
rename from include/asm-m68k/ipcbuf.h
rename to arch/m68k/include/asm/ipcbuf.h
diff --git a/arch/m68k/include/asm/irq.h b/arch/m68k/include/asm/irq.h
new file mode 100644
index 0000000..d031416
--- /dev/null
+++ b/arch/m68k/include/asm/irq.h
@@ -0,0 +1,5 @@
+#ifdef __uClinux__
+#include "irq_no.h"
+#else
+#include "irq_mm.h"
+#endif
diff --git a/include/asm-m68k/irq.h b/arch/m68k/include/asm/irq_mm.h
similarity index 100%
rename from include/asm-m68k/irq.h
rename to arch/m68k/include/asm/irq_mm.h
diff --git a/arch/m68knommu/include/asm/irq.h b/arch/m68k/include/asm/irq_no.h
similarity index 100%
rename from arch/m68knommu/include/asm/irq.h
rename to arch/m68k/include/asm/irq_no.h
diff --git a/include/asm-m68k/irq_regs.h b/arch/m68k/include/asm/irq_regs.h
similarity index 100%
rename from include/asm-m68k/irq_regs.h
rename to arch/m68k/include/asm/irq_regs.h
diff --git a/include/asm-m68k/kdebug.h b/arch/m68k/include/asm/kdebug.h
similarity index 100%
rename from include/asm-m68k/kdebug.h
rename to arch/m68k/include/asm/kdebug.h
diff --git a/arch/m68k/include/asm/kmap_types.h b/arch/m68k/include/asm/kmap_types.h
new file mode 100644
index 0000000..045d9fd
--- /dev/null
+++ b/arch/m68k/include/asm/kmap_types.h
@@ -0,0 +1,5 @@
+#ifdef __uClinux__
+#include "kmap_types_no.h"
+#else
+#include "kmap_types_mm.h"
+#endif
diff --git a/include/asm-m68k/kmap_types.h b/arch/m68k/include/asm/kmap_types_mm.h
similarity index 100%
rename from include/asm-m68k/kmap_types.h
rename to arch/m68k/include/asm/kmap_types_mm.h
diff --git a/arch/m68knommu/include/asm/kmap_types.h b/arch/m68k/include/asm/kmap_types_no.h
similarity index 100%
rename from arch/m68knommu/include/asm/kmap_types.h
rename to arch/m68k/include/asm/kmap_types_no.h
diff --git a/include/asm-m68k/linkage.h b/arch/m68k/include/asm/linkage.h
similarity index 100%
rename from include/asm-m68k/linkage.h
rename to arch/m68k/include/asm/linkage.h
diff --git a/include/asm-m68k/local.h b/arch/m68k/include/asm/local.h
similarity index 100%
rename from include/asm-m68k/local.h
rename to arch/m68k/include/asm/local.h
diff --git a/arch/m68knommu/include/asm/m5206sim.h b/arch/m68k/include/asm/m5206sim.h
similarity index 100%
rename from arch/m68knommu/include/asm/m5206sim.h
rename to arch/m68k/include/asm/m5206sim.h
diff --git a/arch/m68knommu/include/asm/m520xsim.h b/arch/m68k/include/asm/m520xsim.h
similarity index 100%
rename from arch/m68knommu/include/asm/m520xsim.h
rename to arch/m68k/include/asm/m520xsim.h
diff --git a/arch/m68knommu/include/asm/m523xsim.h b/arch/m68k/include/asm/m523xsim.h
similarity index 100%
rename from arch/m68knommu/include/asm/m523xsim.h
rename to arch/m68k/include/asm/m523xsim.h
diff --git a/arch/m68knommu/include/asm/m5249sim.h b/arch/m68k/include/asm/m5249sim.h
similarity index 100%
rename from arch/m68knommu/include/asm/m5249sim.h
rename to arch/m68k/include/asm/m5249sim.h
diff --git a/arch/m68knommu/include/asm/m5272sim.h b/arch/m68k/include/asm/m5272sim.h
similarity index 100%
rename from arch/m68knommu/include/asm/m5272sim.h
rename to arch/m68k/include/asm/m5272sim.h
diff --git a/arch/m68knommu/include/asm/m527xsim.h b/arch/m68k/include/asm/m527xsim.h
similarity index 100%
rename from arch/m68knommu/include/asm/m527xsim.h
rename to arch/m68k/include/asm/m527xsim.h
diff --git a/arch/m68knommu/include/asm/m528xsim.h b/arch/m68k/include/asm/m528xsim.h
similarity index 100%
rename from arch/m68knommu/include/asm/m528xsim.h
rename to arch/m68k/include/asm/m528xsim.h
diff --git a/arch/m68knommu/include/asm/m5307sim.h b/arch/m68k/include/asm/m5307sim.h
similarity index 100%
rename from arch/m68knommu/include/asm/m5307sim.h
rename to arch/m68k/include/asm/m5307sim.h
diff --git a/arch/m68knommu/include/asm/m532xsim.h b/arch/m68k/include/asm/m532xsim.h
similarity index 100%
rename from arch/m68knommu/include/asm/m532xsim.h
rename to arch/m68k/include/asm/m532xsim.h
diff --git a/arch/m68knommu/include/asm/m5407sim.h b/arch/m68k/include/asm/m5407sim.h
similarity index 100%
rename from arch/m68knommu/include/asm/m5407sim.h
rename to arch/m68k/include/asm/m5407sim.h
diff --git a/arch/m68knommu/include/asm/m68360.h b/arch/m68k/include/asm/m68360.h
similarity index 100%
rename from arch/m68knommu/include/asm/m68360.h
rename to arch/m68k/include/asm/m68360.h
diff --git a/arch/m68knommu/include/asm/m68360_enet.h b/arch/m68k/include/asm/m68360_enet.h
similarity index 100%
rename from arch/m68knommu/include/asm/m68360_enet.h
rename to arch/m68k/include/asm/m68360_enet.h
diff --git a/arch/m68knommu/include/asm/m68360_pram.h b/arch/m68k/include/asm/m68360_pram.h
similarity index 100%
rename from arch/m68knommu/include/asm/m68360_pram.h
rename to arch/m68k/include/asm/m68360_pram.h
diff --git a/arch/m68knommu/include/asm/m68360_quicc.h b/arch/m68k/include/asm/m68360_quicc.h
similarity index 100%
rename from arch/m68knommu/include/asm/m68360_quicc.h
rename to arch/m68k/include/asm/m68360_quicc.h
diff --git a/arch/m68knommu/include/asm/m68360_regs.h b/arch/m68k/include/asm/m68360_regs.h
similarity index 100%
rename from arch/m68knommu/include/asm/m68360_regs.h
rename to arch/m68k/include/asm/m68360_regs.h
diff --git a/include/asm-m68k/mac_asc.h b/arch/m68k/include/asm/mac_asc.h
similarity index 100%
rename from include/asm-m68k/mac_asc.h
rename to arch/m68k/include/asm/mac_asc.h
diff --git a/include/asm-m68k/mac_baboon.h b/arch/m68k/include/asm/mac_baboon.h
similarity index 100%
rename from include/asm-m68k/mac_baboon.h
rename to arch/m68k/include/asm/mac_baboon.h
diff --git a/include/asm-m68k/mac_iop.h b/arch/m68k/include/asm/mac_iop.h
similarity index 100%
rename from include/asm-m68k/mac_iop.h
rename to arch/m68k/include/asm/mac_iop.h
diff --git a/include/asm-m68k/mac_mouse.h b/arch/m68k/include/asm/mac_mouse.h
similarity index 100%
rename from include/asm-m68k/mac_mouse.h
rename to arch/m68k/include/asm/mac_mouse.h
diff --git a/include/asm-m68k/mac_oss.h b/arch/m68k/include/asm/mac_oss.h
similarity index 100%
rename from include/asm-m68k/mac_oss.h
rename to arch/m68k/include/asm/mac_oss.h
diff --git a/include/asm-m68k/mac_psc.h b/arch/m68k/include/asm/mac_psc.h
similarity index 100%
rename from include/asm-m68k/mac_psc.h
rename to arch/m68k/include/asm/mac_psc.h
diff --git a/include/asm-m68k/mac_via.h b/arch/m68k/include/asm/mac_via.h
similarity index 100%
rename from include/asm-m68k/mac_via.h
rename to arch/m68k/include/asm/mac_via.h
diff --git a/arch/m68k/include/asm/machdep.h b/arch/m68k/include/asm/machdep.h
new file mode 100644
index 0000000..fc24b6f
--- /dev/null
+++ b/arch/m68k/include/asm/machdep.h
@@ -0,0 +1,5 @@
+#ifdef __uClinux__
+#include "machdep_no.h"
+#else
+#include "machdep_mm.h"
+#endif
diff --git a/include/asm-m68k/machdep.h b/arch/m68k/include/asm/machdep_mm.h
similarity index 100%
rename from include/asm-m68k/machdep.h
rename to arch/m68k/include/asm/machdep_mm.h
diff --git a/arch/m68knommu/include/asm/machdep.h b/arch/m68k/include/asm/machdep_no.h
similarity index 100%
rename from arch/m68knommu/include/asm/machdep.h
rename to arch/m68k/include/asm/machdep_no.h
diff --git a/include/asm-m68k/machines.h b/arch/m68k/include/asm/machines.h
similarity index 100%
rename from include/asm-m68k/machines.h
rename to arch/m68k/include/asm/machines.h
diff --git a/include/asm-m68k/machw.h b/arch/m68k/include/asm/machw.h
similarity index 100%
rename from include/asm-m68k/machw.h
rename to arch/m68k/include/asm/machw.h
diff --git a/include/asm-m68k/macintosh.h b/arch/m68k/include/asm/macintosh.h
similarity index 100%
rename from include/asm-m68k/macintosh.h
rename to arch/m68k/include/asm/macintosh.h
diff --git a/include/asm-m68k/macints.h b/arch/m68k/include/asm/macints.h
similarity index 100%
rename from include/asm-m68k/macints.h
rename to arch/m68k/include/asm/macints.h
diff --git a/include/asm-m68k/math-emu.h b/arch/m68k/include/asm/math-emu.h
similarity index 100%
rename from include/asm-m68k/math-emu.h
rename to arch/m68k/include/asm/math-emu.h
diff --git a/arch/m68k/include/asm/mc146818rtc.h b/arch/m68k/include/asm/mc146818rtc.h
new file mode 100644
index 0000000..fb90dcf
--- /dev/null
+++ b/arch/m68k/include/asm/mc146818rtc.h
@@ -0,0 +1,5 @@
+#ifdef __uClinux__
+#include "mc146818rtc_no.h"
+#else
+#include "mc146818rtc_mm.h"
+#endif
diff --git a/include/asm-m68k/mc146818rtc.h b/arch/m68k/include/asm/mc146818rtc_mm.h
similarity index 100%
rename from include/asm-m68k/mc146818rtc.h
rename to arch/m68k/include/asm/mc146818rtc_mm.h
diff --git a/arch/m68knommu/include/asm/mc146818rtc.h b/arch/m68k/include/asm/mc146818rtc_no.h
similarity index 100%
rename from arch/m68knommu/include/asm/mc146818rtc.h
rename to arch/m68k/include/asm/mc146818rtc_no.h
diff --git a/arch/m68knommu/include/asm/mcfcache.h b/arch/m68k/include/asm/mcfcache.h
similarity index 100%
rename from arch/m68knommu/include/asm/mcfcache.h
rename to arch/m68k/include/asm/mcfcache.h
diff --git a/arch/m68knommu/include/asm/mcfdma.h b/arch/m68k/include/asm/mcfdma.h
similarity index 100%
rename from arch/m68knommu/include/asm/mcfdma.h
rename to arch/m68k/include/asm/mcfdma.h
diff --git a/arch/m68knommu/include/asm/mcfmbus.h b/arch/m68k/include/asm/mcfmbus.h
similarity index 100%
rename from arch/m68knommu/include/asm/mcfmbus.h
rename to arch/m68k/include/asm/mcfmbus.h
diff --git a/arch/m68knommu/include/asm/mcfne.h b/arch/m68k/include/asm/mcfne.h
similarity index 100%
rename from arch/m68knommu/include/asm/mcfne.h
rename to arch/m68k/include/asm/mcfne.h
diff --git a/arch/m68knommu/include/asm/mcfpci.h b/arch/m68k/include/asm/mcfpci.h
similarity index 100%
rename from arch/m68knommu/include/asm/mcfpci.h
rename to arch/m68k/include/asm/mcfpci.h
diff --git a/arch/m68knommu/include/asm/mcfpit.h b/arch/m68k/include/asm/mcfpit.h
similarity index 100%
rename from arch/m68knommu/include/asm/mcfpit.h
rename to arch/m68k/include/asm/mcfpit.h
diff --git a/arch/m68knommu/include/asm/mcfsim.h b/arch/m68k/include/asm/mcfsim.h
similarity index 100%
rename from arch/m68knommu/include/asm/mcfsim.h
rename to arch/m68k/include/asm/mcfsim.h
diff --git a/arch/m68knommu/include/asm/mcfsmc.h b/arch/m68k/include/asm/mcfsmc.h
similarity index 100%
rename from arch/m68knommu/include/asm/mcfsmc.h
rename to arch/m68k/include/asm/mcfsmc.h
diff --git a/arch/m68knommu/include/asm/mcftimer.h b/arch/m68k/include/asm/mcftimer.h
similarity index 100%
rename from arch/m68knommu/include/asm/mcftimer.h
rename to arch/m68k/include/asm/mcftimer.h
diff --git a/arch/m68knommu/include/asm/mcfuart.h b/arch/m68k/include/asm/mcfuart.h
similarity index 100%
rename from arch/m68knommu/include/asm/mcfuart.h
rename to arch/m68k/include/asm/mcfuart.h
diff --git a/arch/m68knommu/include/asm/mcfwdebug.h b/arch/m68k/include/asm/mcfwdebug.h
similarity index 100%
rename from arch/m68knommu/include/asm/mcfwdebug.h
rename to arch/m68k/include/asm/mcfwdebug.h
diff --git a/include/asm-m68k/md.h b/arch/m68k/include/asm/md.h
similarity index 100%
rename from include/asm-m68k/md.h
rename to arch/m68k/include/asm/md.h
diff --git a/include/asm-m68k/mman.h b/arch/m68k/include/asm/mman.h
similarity index 100%
rename from include/asm-m68k/mman.h
rename to arch/m68k/include/asm/mman.h
diff --git a/arch/m68k/include/asm/mmu.h b/arch/m68k/include/asm/mmu.h
new file mode 100644
index 0000000..a81d394
--- /dev/null
+++ b/arch/m68k/include/asm/mmu.h
@@ -0,0 +1,5 @@
+#ifdef __uClinux__
+#include "mmu_no.h"
+#else
+#include "mmu_mm.h"
+#endif
diff --git a/arch/m68k/include/asm/mmu_context.h b/arch/m68k/include/asm/mmu_context.h
new file mode 100644
index 0000000..b440928
--- /dev/null
+++ b/arch/m68k/include/asm/mmu_context.h
@@ -0,0 +1,5 @@
+#ifdef __uClinux__
+#include "mmu_context_no.h"
+#else
+#include "mmu_context_mm.h"
+#endif
diff --git a/include/asm-m68k/mmu_context.h b/arch/m68k/include/asm/mmu_context_mm.h
similarity index 100%
rename from include/asm-m68k/mmu_context.h
rename to arch/m68k/include/asm/mmu_context_mm.h
diff --git a/arch/m68knommu/include/asm/mmu_context.h b/arch/m68k/include/asm/mmu_context_no.h
similarity index 100%
rename from arch/m68knommu/include/asm/mmu_context.h
rename to arch/m68k/include/asm/mmu_context_no.h
diff --git a/include/asm-m68k/mmu.h b/arch/m68k/include/asm/mmu_mm.h
similarity index 100%
rename from include/asm-m68k/mmu.h
rename to arch/m68k/include/asm/mmu_mm.h
diff --git a/arch/m68knommu/include/asm/mmu.h b/arch/m68k/include/asm/mmu_no.h
similarity index 100%
rename from arch/m68knommu/include/asm/mmu.h
rename to arch/m68k/include/asm/mmu_no.h
diff --git a/include/asm-m68k/mmzone.h b/arch/m68k/include/asm/mmzone.h
similarity index 100%
rename from include/asm-m68k/mmzone.h
rename to arch/m68k/include/asm/mmzone.h
diff --git a/arch/m68k/include/asm/module.h b/arch/m68k/include/asm/module.h
new file mode 100644
index 0000000..79b59d1
--- /dev/null
+++ b/arch/m68k/include/asm/module.h
@@ -0,0 +1,5 @@
+#ifdef __uClinux__
+#include "module_no.h"
+#else
+#include "module_mm.h"
+#endif
diff --git a/include/asm-m68k/module.h b/arch/m68k/include/asm/module_mm.h
similarity index 100%
rename from include/asm-m68k/module.h
rename to arch/m68k/include/asm/module_mm.h
diff --git a/arch/m68knommu/include/asm/module.h b/arch/m68k/include/asm/module_no.h
similarity index 100%
rename from arch/m68knommu/include/asm/module.h
rename to arch/m68k/include/asm/module_no.h
diff --git a/include/asm-m68k/motorola_pgalloc.h b/arch/m68k/include/asm/motorola_pgalloc.h
similarity index 100%
rename from include/asm-m68k/motorola_pgalloc.h
rename to arch/m68k/include/asm/motorola_pgalloc.h
diff --git a/include/asm-m68k/motorola_pgtable.h b/arch/m68k/include/asm/motorola_pgtable.h
similarity index 100%
rename from include/asm-m68k/motorola_pgtable.h
rename to arch/m68k/include/asm/motorola_pgtable.h
diff --git a/include/asm-m68k/movs.h b/arch/m68k/include/asm/movs.h
similarity index 100%
rename from include/asm-m68k/movs.h
rename to arch/m68k/include/asm/movs.h
diff --git a/include/asm-m68k/msgbuf.h b/arch/m68k/include/asm/msgbuf.h
similarity index 100%
rename from include/asm-m68k/msgbuf.h
rename to arch/m68k/include/asm/msgbuf.h
diff --git a/include/asm-m68k/mutex.h b/arch/m68k/include/asm/mutex.h
similarity index 100%
rename from include/asm-m68k/mutex.h
rename to arch/m68k/include/asm/mutex.h
diff --git a/include/asm-m68k/mvme147hw.h b/arch/m68k/include/asm/mvme147hw.h
similarity index 100%
rename from include/asm-m68k/mvme147hw.h
rename to arch/m68k/include/asm/mvme147hw.h
diff --git a/include/asm-m68k/mvme16xhw.h b/arch/m68k/include/asm/mvme16xhw.h
similarity index 100%
rename from include/asm-m68k/mvme16xhw.h
rename to arch/m68k/include/asm/mvme16xhw.h
diff --git a/arch/m68knommu/include/asm/nettel.h b/arch/m68k/include/asm/nettel.h
similarity index 100%
rename from arch/m68knommu/include/asm/nettel.h
rename to arch/m68k/include/asm/nettel.h
diff --git a/include/asm-m68k/nubus.h b/arch/m68k/include/asm/nubus.h
similarity index 100%
rename from include/asm-m68k/nubus.h
rename to arch/m68k/include/asm/nubus.h
diff --git a/include/asm-m68k/openprom.h b/arch/m68k/include/asm/openprom.h
similarity index 100%
rename from include/asm-m68k/openprom.h
rename to arch/m68k/include/asm/openprom.h
diff --git a/include/asm-m68k/oplib.h b/arch/m68k/include/asm/oplib.h
similarity index 100%
rename from include/asm-m68k/oplib.h
rename to arch/m68k/include/asm/oplib.h
diff --git a/arch/m68k/include/asm/page.h b/arch/m68k/include/asm/page.h
new file mode 100644
index 0000000..f2b4480
--- /dev/null
+++ b/arch/m68k/include/asm/page.h
@@ -0,0 +1,5 @@
+#ifdef __uClinux__
+#include "page_no.h"
+#else
+#include "page_mm.h"
+#endif
diff --git a/include/asm-m68k/page.h b/arch/m68k/include/asm/page_mm.h
similarity index 100%
rename from include/asm-m68k/page.h
rename to arch/m68k/include/asm/page_mm.h
diff --git a/arch/m68knommu/include/asm/page.h b/arch/m68k/include/asm/page_no.h
similarity index 100%
rename from arch/m68knommu/include/asm/page.h
rename to arch/m68k/include/asm/page_no.h
diff --git a/arch/m68k/include/asm/page_offset.h b/arch/m68k/include/asm/page_offset.h
new file mode 100644
index 0000000..66455c8
--- /dev/null
+++ b/arch/m68k/include/asm/page_offset.h
@@ -0,0 +1,5 @@
+#ifdef __uClinux__
+#include "page_offset_no.h"
+#else
+#include "page_offset_mm.h"
+#endif
diff --git a/include/asm-m68k/page_offset.h b/arch/m68k/include/asm/page_offset_mm.h
similarity index 100%
rename from include/asm-m68k/page_offset.h
rename to arch/m68k/include/asm/page_offset_mm.h
diff --git a/arch/m68knommu/include/asm/page_offset.h b/arch/m68k/include/asm/page_offset_no.h
similarity index 100%
rename from arch/m68knommu/include/asm/page_offset.h
rename to arch/m68k/include/asm/page_offset_no.h
diff --git a/arch/m68k/include/asm/param.h b/arch/m68k/include/asm/param.h
new file mode 100644
index 0000000..40d1112
--- /dev/null
+++ b/arch/m68k/include/asm/param.h
@@ -0,0 +1,5 @@
+#ifdef __uClinux__
+#include "param_no.h"
+#else
+#include "param_mm.h"
+#endif
diff --git a/include/asm-m68k/param.h b/arch/m68k/include/asm/param_mm.h
similarity index 100%
rename from include/asm-m68k/param.h
rename to arch/m68k/include/asm/param_mm.h
diff --git a/arch/m68knommu/include/asm/param.h b/arch/m68k/include/asm/param_no.h
similarity index 100%
rename from arch/m68knommu/include/asm/param.h
rename to arch/m68k/include/asm/param_no.h
diff --git a/include/asm-m68k/parport.h b/arch/m68k/include/asm/parport.h
similarity index 100%
rename from include/asm-m68k/parport.h
rename to arch/m68k/include/asm/parport.h
diff --git a/arch/m68k/include/asm/pci.h b/arch/m68k/include/asm/pci.h
new file mode 100644
index 0000000..dbea953
--- /dev/null
+++ b/arch/m68k/include/asm/pci.h
@@ -0,0 +1,5 @@
+#ifdef __uClinux__
+#include "pci_no.h"
+#else
+#include "pci_mm.h"
+#endif
diff --git a/include/asm-m68k/pci.h b/arch/m68k/include/asm/pci_mm.h
similarity index 100%
rename from include/asm-m68k/pci.h
rename to arch/m68k/include/asm/pci_mm.h
diff --git a/arch/m68knommu/include/asm/pci.h b/arch/m68k/include/asm/pci_no.h
similarity index 96%
rename from arch/m68knommu/include/asm/pci.h
rename to arch/m68k/include/asm/pci_no.h
index a13f3cc..9abbc03 100644
--- a/arch/m68knommu/include/asm/pci.h
+++ b/arch/m68k/include/asm/pci_no.h
@@ -1,7 +1,7 @@
 #ifndef M68KNOMMU_PCI_H
 #define	M68KNOMMU_PCI_H
 
-#include <asm-m68k/pci.h>
+#include <asm/pci_mm.h>
 
 #ifdef CONFIG_COMEMPCI
 /*
diff --git a/include/asm-m68k/percpu.h b/arch/m68k/include/asm/percpu.h
similarity index 100%
rename from include/asm-m68k/percpu.h
rename to arch/m68k/include/asm/percpu.h
diff --git a/arch/m68k/include/asm/pgalloc.h b/arch/m68k/include/asm/pgalloc.h
new file mode 100644
index 0000000..059cb73
--- /dev/null
+++ b/arch/m68k/include/asm/pgalloc.h
@@ -0,0 +1,5 @@
+#ifdef __uClinux__
+#include "pgalloc_no.h"
+#else
+#include "pgalloc_mm.h"
+#endif
diff --git a/include/asm-m68k/pgalloc.h b/arch/m68k/include/asm/pgalloc_mm.h
similarity index 100%
rename from include/asm-m68k/pgalloc.h
rename to arch/m68k/include/asm/pgalloc_mm.h
diff --git a/arch/m68knommu/include/asm/pgalloc.h b/arch/m68k/include/asm/pgalloc_no.h
similarity index 100%
rename from arch/m68knommu/include/asm/pgalloc.h
rename to arch/m68k/include/asm/pgalloc_no.h
diff --git a/arch/m68k/include/asm/pgtable.h b/arch/m68k/include/asm/pgtable.h
new file mode 100644
index 0000000..ee6759e
--- /dev/null
+++ b/arch/m68k/include/asm/pgtable.h
@@ -0,0 +1,5 @@
+#ifdef __uClinux__
+#include "pgtable_no.h"
+#else
+#include "pgtable_mm.h"
+#endif
diff --git a/include/asm-m68k/pgtable.h b/arch/m68k/include/asm/pgtable_mm.h
similarity index 100%
rename from include/asm-m68k/pgtable.h
rename to arch/m68k/include/asm/pgtable_mm.h
diff --git a/arch/m68knommu/include/asm/pgtable.h b/arch/m68k/include/asm/pgtable_no.h
similarity index 100%
rename from arch/m68knommu/include/asm/pgtable.h
rename to arch/m68k/include/asm/pgtable_no.h
diff --git a/include/asm-m68k/poll.h b/arch/m68k/include/asm/poll.h
similarity index 100%
rename from include/asm-m68k/poll.h
rename to arch/m68k/include/asm/poll.h
diff --git a/include/asm-m68k/posix_types.h b/arch/m68k/include/asm/posix_types.h
similarity index 100%
rename from include/asm-m68k/posix_types.h
rename to arch/m68k/include/asm/posix_types.h
diff --git a/arch/m68k/include/asm/processor.h b/arch/m68k/include/asm/processor.h
new file mode 100644
index 0000000..fc3f2c2
--- /dev/null
+++ b/arch/m68k/include/asm/processor.h
@@ -0,0 +1,5 @@
+#ifdef __uClinux__
+#include "processor_no.h"
+#else
+#include "processor_mm.h"
+#endif
diff --git a/include/asm-m68k/processor.h b/arch/m68k/include/asm/processor_mm.h
similarity index 100%
rename from include/asm-m68k/processor.h
rename to arch/m68k/include/asm/processor_mm.h
diff --git a/arch/m68knommu/include/asm/processor.h b/arch/m68k/include/asm/processor_no.h
similarity index 100%
rename from arch/m68knommu/include/asm/processor.h
rename to arch/m68k/include/asm/processor_no.h
diff --git a/arch/m68k/include/asm/ptrace.h b/arch/m68k/include/asm/ptrace.h
new file mode 100644
index 0000000..e83cd2f
--- /dev/null
+++ b/arch/m68k/include/asm/ptrace.h
@@ -0,0 +1,5 @@
+#ifdef __uClinux__
+#include "ptrace_no.h"
+#else
+#include "ptrace_mm.h"
+#endif
diff --git a/include/asm-m68k/ptrace.h b/arch/m68k/include/asm/ptrace_mm.h
similarity index 100%
rename from include/asm-m68k/ptrace.h
rename to arch/m68k/include/asm/ptrace_mm.h
diff --git a/arch/m68knommu/include/asm/ptrace.h b/arch/m68k/include/asm/ptrace_no.h
similarity index 100%
rename from arch/m68knommu/include/asm/ptrace.h
rename to arch/m68k/include/asm/ptrace_no.h
diff --git a/include/asm-m68k/q40_master.h b/arch/m68k/include/asm/q40_master.h
similarity index 100%
rename from include/asm-m68k/q40_master.h
rename to arch/m68k/include/asm/q40_master.h
diff --git a/include/asm-m68k/q40ints.h b/arch/m68k/include/asm/q40ints.h
similarity index 100%
rename from include/asm-m68k/q40ints.h
rename to arch/m68k/include/asm/q40ints.h
diff --git a/arch/m68knommu/include/asm/quicc_simple.h b/arch/m68k/include/asm/quicc_simple.h
similarity index 100%
rename from arch/m68knommu/include/asm/quicc_simple.h
rename to arch/m68k/include/asm/quicc_simple.h
diff --git a/include/asm-m68k/raw_io.h b/arch/m68k/include/asm/raw_io.h
similarity index 100%
rename from include/asm-m68k/raw_io.h
rename to arch/m68k/include/asm/raw_io.h
diff --git a/include/asm-m68k/resource.h b/arch/m68k/include/asm/resource.h
similarity index 100%
rename from include/asm-m68k/resource.h
rename to arch/m68k/include/asm/resource.h
diff --git a/include/asm-m68k/rtc.h b/arch/m68k/include/asm/rtc.h
similarity index 100%
rename from include/asm-m68k/rtc.h
rename to arch/m68k/include/asm/rtc.h
diff --git a/include/asm-m68k/sbus.h b/arch/m68k/include/asm/sbus.h
similarity index 100%
rename from include/asm-m68k/sbus.h
rename to arch/m68k/include/asm/sbus.h
diff --git a/arch/m68k/include/asm/scatterlist.h b/arch/m68k/include/asm/scatterlist.h
new file mode 100644
index 0000000..b7e5286
--- /dev/null
+++ b/arch/m68k/include/asm/scatterlist.h
@@ -0,0 +1,5 @@
+#ifdef __uClinux__
+#include "scatterlist_no.h"
+#else
+#include "scatterlist_mm.h"
+#endif
diff --git a/include/asm-m68k/scatterlist.h b/arch/m68k/include/asm/scatterlist_mm.h
similarity index 100%
rename from include/asm-m68k/scatterlist.h
rename to arch/m68k/include/asm/scatterlist_mm.h
diff --git a/arch/m68knommu/include/asm/scatterlist.h b/arch/m68k/include/asm/scatterlist_no.h
similarity index 100%
rename from arch/m68knommu/include/asm/scatterlist.h
rename to arch/m68k/include/asm/scatterlist_no.h
diff --git a/include/asm-m68k/sections.h b/arch/m68k/include/asm/sections.h
similarity index 100%
rename from include/asm-m68k/sections.h
rename to arch/m68k/include/asm/sections.h
diff --git a/arch/m68k/include/asm/segment.h b/arch/m68k/include/asm/segment.h
new file mode 100644
index 0000000..82583bc
--- /dev/null
+++ b/arch/m68k/include/asm/segment.h
@@ -0,0 +1,5 @@
+#ifdef __uClinux__
+#include "segment_no.h"
+#else
+#include "segment_mm.h"
+#endif
diff --git a/include/asm-m68k/segment.h b/arch/m68k/include/asm/segment_mm.h
similarity index 100%
rename from include/asm-m68k/segment.h
rename to arch/m68k/include/asm/segment_mm.h
diff --git a/arch/m68knommu/include/asm/segment.h b/arch/m68k/include/asm/segment_no.h
similarity index 100%
rename from arch/m68knommu/include/asm/segment.h
rename to arch/m68k/include/asm/segment_no.h
diff --git a/include/asm-m68k/sembuf.h b/arch/m68k/include/asm/sembuf.h
similarity index 100%
rename from include/asm-m68k/sembuf.h
rename to arch/m68k/include/asm/sembuf.h
diff --git a/include/asm-m68k/serial.h b/arch/m68k/include/asm/serial.h
similarity index 100%
rename from include/asm-m68k/serial.h
rename to arch/m68k/include/asm/serial.h
diff --git a/arch/m68k/include/asm/setup.h b/arch/m68k/include/asm/setup.h
new file mode 100644
index 0000000..842f86f
--- /dev/null
+++ b/arch/m68k/include/asm/setup.h
@@ -0,0 +1,5 @@
+#ifdef __uClinux__
+#include "setup_no.h"
+#else
+#include "setup_mm.h"
+#endif
diff --git a/include/asm-m68k/setup.h b/arch/m68k/include/asm/setup_mm.h
similarity index 100%
rename from include/asm-m68k/setup.h
rename to arch/m68k/include/asm/setup_mm.h
diff --git a/arch/m68knommu/include/asm/setup.h b/arch/m68k/include/asm/setup_no.h
similarity index 84%
rename from arch/m68knommu/include/asm/setup.h
rename to arch/m68k/include/asm/setup_no.h
index fb86bb2..45d286c 100644
--- a/arch/m68knommu/include/asm/setup.h
+++ b/arch/m68k/include/asm/setup_no.h
@@ -1,6 +1,6 @@
 #ifdef __KERNEL__
 
-#include <asm-m68k/setup.h>
+#include <asm/setup_mm.h>
 
 /* We have a bigger command line buffer. */
 #undef COMMAND_LINE_SIZE
diff --git a/include/asm-m68k/shm.h b/arch/m68k/include/asm/shm.h
similarity index 100%
rename from include/asm-m68k/shm.h
rename to arch/m68k/include/asm/shm.h
diff --git a/include/asm-m68k/shmbuf.h b/arch/m68k/include/asm/shmbuf.h
similarity index 100%
rename from include/asm-m68k/shmbuf.h
rename to arch/m68k/include/asm/shmbuf.h
diff --git a/include/asm-m68k/shmparam.h b/arch/m68k/include/asm/shmparam.h
similarity index 100%
rename from include/asm-m68k/shmparam.h
rename to arch/m68k/include/asm/shmparam.h
diff --git a/arch/m68k/include/asm/sigcontext.h b/arch/m68k/include/asm/sigcontext.h
new file mode 100644
index 0000000..bff6d40
--- /dev/null
+++ b/arch/m68k/include/asm/sigcontext.h
@@ -0,0 +1,5 @@
+#ifdef __uClinux__
+#include "sigcontext_no.h"
+#else
+#include "sigcontext_mm.h"
+#endif
diff --git a/include/asm-m68k/sigcontext.h b/arch/m68k/include/asm/sigcontext_mm.h
similarity index 100%
rename from include/asm-m68k/sigcontext.h
rename to arch/m68k/include/asm/sigcontext_mm.h
diff --git a/arch/m68knommu/include/asm/sigcontext.h b/arch/m68k/include/asm/sigcontext_no.h
similarity index 100%
rename from arch/m68knommu/include/asm/sigcontext.h
rename to arch/m68k/include/asm/sigcontext_no.h
diff --git a/arch/m68k/include/asm/siginfo.h b/arch/m68k/include/asm/siginfo.h
new file mode 100644
index 0000000..61219d7
--- /dev/null
+++ b/arch/m68k/include/asm/siginfo.h
@@ -0,0 +1,5 @@
+#ifdef __uClinux__
+#include "siginfo_no.h"
+#else
+#include "siginfo_mm.h"
+#endif
diff --git a/include/asm-m68k/siginfo.h b/arch/m68k/include/asm/siginfo_mm.h
similarity index 100%
rename from include/asm-m68k/siginfo.h
rename to arch/m68k/include/asm/siginfo_mm.h
diff --git a/arch/m68knommu/include/asm/siginfo.h b/arch/m68k/include/asm/siginfo_no.h
similarity index 100%
rename from arch/m68knommu/include/asm/siginfo.h
rename to arch/m68k/include/asm/siginfo_no.h
diff --git a/arch/m68k/include/asm/signal.h b/arch/m68k/include/asm/signal.h
new file mode 100644
index 0000000..3c19988
--- /dev/null
+++ b/arch/m68k/include/asm/signal.h
@@ -0,0 +1,5 @@
+#ifdef __uClinux__
+#include "signal_no.h"
+#else
+#include "signal_mm.h"
+#endif
diff --git a/include/asm-m68k/signal.h b/arch/m68k/include/asm/signal_mm.h
similarity index 100%
rename from include/asm-m68k/signal.h
rename to arch/m68k/include/asm/signal_mm.h
diff --git a/arch/m68knommu/include/asm/signal.h b/arch/m68k/include/asm/signal_no.h
similarity index 100%
rename from arch/m68knommu/include/asm/signal.h
rename to arch/m68k/include/asm/signal_no.h
diff --git a/arch/m68knommu/include/asm/smp.h b/arch/m68k/include/asm/smp.h
similarity index 100%
rename from arch/m68knommu/include/asm/smp.h
rename to arch/m68k/include/asm/smp.h
diff --git a/include/asm-m68k/socket.h b/arch/m68k/include/asm/socket.h
similarity index 100%
rename from include/asm-m68k/socket.h
rename to arch/m68k/include/asm/socket.h
diff --git a/include/asm-m68k/sockios.h b/arch/m68k/include/asm/sockios.h
similarity index 100%
rename from include/asm-m68k/sockios.h
rename to arch/m68k/include/asm/sockios.h
diff --git a/include/asm-m68k/spinlock.h b/arch/m68k/include/asm/spinlock.h
similarity index 100%
rename from include/asm-m68k/spinlock.h
rename to arch/m68k/include/asm/spinlock.h
diff --git a/include/asm-m68k/stat.h b/arch/m68k/include/asm/stat.h
similarity index 100%
rename from include/asm-m68k/stat.h
rename to arch/m68k/include/asm/stat.h
diff --git a/include/asm-m68k/statfs.h b/arch/m68k/include/asm/statfs.h
similarity index 100%
rename from include/asm-m68k/statfs.h
rename to arch/m68k/include/asm/statfs.h
diff --git a/arch/m68k/include/asm/string.h b/arch/m68k/include/asm/string.h
new file mode 100644
index 0000000..2c356f9
--- /dev/null
+++ b/arch/m68k/include/asm/string.h
@@ -0,0 +1,5 @@
+#ifdef __uClinux__
+#include "string_no.h"
+#else
+#include "string_mm.h"
+#endif
diff --git a/include/asm-m68k/string.h b/arch/m68k/include/asm/string_mm.h
similarity index 100%
rename from include/asm-m68k/string.h
rename to arch/m68k/include/asm/string_mm.h
diff --git a/arch/m68knommu/include/asm/string.h b/arch/m68k/include/asm/string_no.h
similarity index 100%
rename from arch/m68knommu/include/asm/string.h
rename to arch/m68k/include/asm/string_no.h
diff --git a/include/asm-m68k/sun3-head.h b/arch/m68k/include/asm/sun3-head.h
similarity index 100%
rename from include/asm-m68k/sun3-head.h
rename to arch/m68k/include/asm/sun3-head.h
diff --git a/include/asm-m68k/sun3_pgalloc.h b/arch/m68k/include/asm/sun3_pgalloc.h
similarity index 100%
rename from include/asm-m68k/sun3_pgalloc.h
rename to arch/m68k/include/asm/sun3_pgalloc.h
diff --git a/include/asm-m68k/sun3_pgtable.h b/arch/m68k/include/asm/sun3_pgtable.h
similarity index 100%
rename from include/asm-m68k/sun3_pgtable.h
rename to arch/m68k/include/asm/sun3_pgtable.h
diff --git a/include/asm-m68k/sun3ints.h b/arch/m68k/include/asm/sun3ints.h
similarity index 100%
rename from include/asm-m68k/sun3ints.h
rename to arch/m68k/include/asm/sun3ints.h
diff --git a/include/asm-m68k/sun3mmu.h b/arch/m68k/include/asm/sun3mmu.h
similarity index 100%
rename from include/asm-m68k/sun3mmu.h
rename to arch/m68k/include/asm/sun3mmu.h
diff --git a/include/asm-m68k/sun3x.h b/arch/m68k/include/asm/sun3x.h
similarity index 100%
rename from include/asm-m68k/sun3x.h
rename to arch/m68k/include/asm/sun3x.h
diff --git a/include/asm-m68k/sun3xflop.h b/arch/m68k/include/asm/sun3xflop.h
similarity index 100%
rename from include/asm-m68k/sun3xflop.h
rename to arch/m68k/include/asm/sun3xflop.h
diff --git a/include/asm-m68k/sun3xprom.h b/arch/m68k/include/asm/sun3xprom.h
similarity index 100%
rename from include/asm-m68k/sun3xprom.h
rename to arch/m68k/include/asm/sun3xprom.h
diff --git a/include/asm-m68k/suspend.h b/arch/m68k/include/asm/suspend.h
similarity index 100%
rename from include/asm-m68k/suspend.h
rename to arch/m68k/include/asm/suspend.h
diff --git a/arch/m68k/include/asm/swab.h b/arch/m68k/include/asm/swab.h
new file mode 100644
index 0000000..e69de29
diff --git a/include/asm-m68k/swab.h b/arch/m68k/include/asm/swab_mm.h
similarity index 100%
rename from include/asm-m68k/swab.h
rename to arch/m68k/include/asm/swab_mm.h
diff --git a/arch/m68knommu/include/asm/swab.h b/arch/m68k/include/asm/swab_no.h
similarity index 100%
rename from arch/m68knommu/include/asm/swab.h
rename to arch/m68k/include/asm/swab_no.h
diff --git a/arch/m68k/include/asm/system.h b/arch/m68k/include/asm/system.h
new file mode 100644
index 0000000..ccea925
--- /dev/null
+++ b/arch/m68k/include/asm/system.h
@@ -0,0 +1,5 @@
+#ifdef __uClinux__
+#include "system_no.h"
+#else
+#include "system_mm.h"
+#endif
diff --git a/include/asm-m68k/system.h b/arch/m68k/include/asm/system_mm.h
similarity index 100%
rename from include/asm-m68k/system.h
rename to arch/m68k/include/asm/system_mm.h
diff --git a/arch/m68knommu/include/asm/system.h b/arch/m68k/include/asm/system_no.h
similarity index 100%
rename from arch/m68knommu/include/asm/system.h
rename to arch/m68k/include/asm/system_no.h
diff --git a/include/asm-m68k/termbits.h b/arch/m68k/include/asm/termbits.h
similarity index 100%
rename from include/asm-m68k/termbits.h
rename to arch/m68k/include/asm/termbits.h
diff --git a/include/asm-m68k/termios.h b/arch/m68k/include/asm/termios.h
similarity index 100%
rename from include/asm-m68k/termios.h
rename to arch/m68k/include/asm/termios.h
diff --git a/arch/m68k/include/asm/thread_info.h b/arch/m68k/include/asm/thread_info.h
new file mode 100644
index 0000000..f31a3f4
--- /dev/null
+++ b/arch/m68k/include/asm/thread_info.h
@@ -0,0 +1,5 @@
+#ifdef __uClinux__
+#include "thread_info_no.h"
+#else
+#include "thread_info_mm.h"
+#endif
diff --git a/include/asm-m68k/thread_info.h b/arch/m68k/include/asm/thread_info_mm.h
similarity index 100%
rename from include/asm-m68k/thread_info.h
rename to arch/m68k/include/asm/thread_info_mm.h
diff --git a/arch/m68knommu/include/asm/thread_info.h b/arch/m68k/include/asm/thread_info_no.h
similarity index 100%
rename from arch/m68knommu/include/asm/thread_info.h
rename to arch/m68k/include/asm/thread_info_no.h
diff --git a/arch/m68k/include/asm/timex.h b/arch/m68k/include/asm/timex.h
new file mode 100644
index 0000000..7197629
--- /dev/null
+++ b/arch/m68k/include/asm/timex.h
@@ -0,0 +1,5 @@
+#ifdef __uClinux__
+#include "timex_no.h"
+#else
+#include "timex_mm.h"
+#endif
diff --git a/include/asm-m68k/timex.h b/arch/m68k/include/asm/timex_mm.h
similarity index 100%
rename from include/asm-m68k/timex.h
rename to arch/m68k/include/asm/timex_mm.h
diff --git a/arch/m68knommu/include/asm/timex.h b/arch/m68k/include/asm/timex_no.h
similarity index 100%
rename from arch/m68knommu/include/asm/timex.h
rename to arch/m68k/include/asm/timex_no.h
diff --git a/include/asm-m68k/tlb.h b/arch/m68k/include/asm/tlb.h
similarity index 100%
rename from include/asm-m68k/tlb.h
rename to arch/m68k/include/asm/tlb.h
diff --git a/arch/m68k/include/asm/tlbflush.h b/arch/m68k/include/asm/tlbflush.h
new file mode 100644
index 0000000..b6f93b3
--- /dev/null
+++ b/arch/m68k/include/asm/tlbflush.h
@@ -0,0 +1,5 @@
+#ifdef __uClinux__
+#include "tlbflush_no.h"
+#else
+#include "tlbflush_mm.h"
+#endif
diff --git a/include/asm-m68k/tlbflush.h b/arch/m68k/include/asm/tlbflush_mm.h
similarity index 100%
rename from include/asm-m68k/tlbflush.h
rename to arch/m68k/include/asm/tlbflush_mm.h
diff --git a/arch/m68knommu/include/asm/tlbflush.h b/arch/m68k/include/asm/tlbflush_no.h
similarity index 100%
rename from arch/m68knommu/include/asm/tlbflush.h
rename to arch/m68k/include/asm/tlbflush_no.h
diff --git a/include/asm-m68k/topology.h b/arch/m68k/include/asm/topology.h
similarity index 100%
rename from include/asm-m68k/topology.h
rename to arch/m68k/include/asm/topology.h
diff --git a/arch/m68k/include/asm/traps.h b/arch/m68k/include/asm/traps.h
new file mode 100644
index 0000000..3011ec0
--- /dev/null
+++ b/arch/m68k/include/asm/traps.h
@@ -0,0 +1,5 @@
+#ifdef __uClinux__
+#include "traps_no.h"
+#else
+#include "traps_mm.h"
+#endif
diff --git a/include/asm-m68k/traps.h b/arch/m68k/include/asm/traps_mm.h
similarity index 100%
rename from include/asm-m68k/traps.h
rename to arch/m68k/include/asm/traps_mm.h
diff --git a/arch/m68knommu/include/asm/traps.h b/arch/m68k/include/asm/traps_no.h
similarity index 100%
rename from arch/m68knommu/include/asm/traps.h
rename to arch/m68k/include/asm/traps_no.h
diff --git a/include/asm-m68k/types.h b/arch/m68k/include/asm/types.h
similarity index 100%
rename from include/asm-m68k/types.h
rename to arch/m68k/include/asm/types.h
diff --git a/arch/m68k/include/asm/uaccess.h b/arch/m68k/include/asm/uaccess.h
new file mode 100644
index 0000000..38f92db
--- /dev/null
+++ b/arch/m68k/include/asm/uaccess.h
@@ -0,0 +1,5 @@
+#ifdef __uClinux__
+#include "uaccess_no.h"
+#else
+#include "uaccess_mm.h"
+#endif
diff --git a/include/asm-m68k/uaccess.h b/arch/m68k/include/asm/uaccess_mm.h
similarity index 100%
rename from include/asm-m68k/uaccess.h
rename to arch/m68k/include/asm/uaccess_mm.h
diff --git a/arch/m68knommu/include/asm/uaccess.h b/arch/m68k/include/asm/uaccess_no.h
similarity index 100%
rename from arch/m68knommu/include/asm/uaccess.h
rename to arch/m68k/include/asm/uaccess_no.h
diff --git a/arch/m68k/include/asm/ucontext.h b/arch/m68k/include/asm/ucontext.h
new file mode 100644
index 0000000..b53cd16
--- /dev/null
+++ b/arch/m68k/include/asm/ucontext.h
@@ -0,0 +1,5 @@
+#ifdef __uClinux__
+#include "ucontext_no.h"
+#else
+#include "ucontext_mm.h"
+#endif
diff --git a/include/asm-m68k/ucontext.h b/arch/m68k/include/asm/ucontext_mm.h
similarity index 100%
rename from include/asm-m68k/ucontext.h
rename to arch/m68k/include/asm/ucontext_mm.h
diff --git a/arch/m68knommu/include/asm/ucontext.h b/arch/m68k/include/asm/ucontext_no.h
similarity index 100%
rename from arch/m68knommu/include/asm/ucontext.h
rename to arch/m68k/include/asm/ucontext_no.h
diff --git a/arch/m68k/include/asm/unaligned.h b/arch/m68k/include/asm/unaligned.h
new file mode 100644
index 0000000..c640bba
--- /dev/null
+++ b/arch/m68k/include/asm/unaligned.h
@@ -0,0 +1,5 @@
+#ifdef __uClinux__
+#include "unaligned_no.h"
+#else
+#include "unaligned_mm.h"
+#endif
diff --git a/include/asm-m68k/unaligned.h b/arch/m68k/include/asm/unaligned_mm.h
similarity index 100%
rename from include/asm-m68k/unaligned.h
rename to arch/m68k/include/asm/unaligned_mm.h
diff --git a/arch/m68knommu/include/asm/unaligned.h b/arch/m68k/include/asm/unaligned_no.h
similarity index 100%
rename from arch/m68knommu/include/asm/unaligned.h
rename to arch/m68k/include/asm/unaligned_no.h
diff --git a/arch/m68k/include/asm/unistd.h b/arch/m68k/include/asm/unistd.h
new file mode 100644
index 0000000..df1d9d4
--- /dev/null
+++ b/arch/m68k/include/asm/unistd.h
@@ -0,0 +1,5 @@
+#ifdef __uClinux__
+#include "unistd_no.h"
+#else
+#include "unistd_mm.h"
+#endif
diff --git a/include/asm-m68k/unistd.h b/arch/m68k/include/asm/unistd_mm.h
similarity index 100%
rename from include/asm-m68k/unistd.h
rename to arch/m68k/include/asm/unistd_mm.h
diff --git a/arch/m68knommu/include/asm/unistd.h b/arch/m68k/include/asm/unistd_no.h
similarity index 100%
rename from arch/m68knommu/include/asm/unistd.h
rename to arch/m68k/include/asm/unistd_no.h
diff --git a/include/asm-m68k/user.h b/arch/m68k/include/asm/user.h
similarity index 100%
rename from include/asm-m68k/user.h
rename to arch/m68k/include/asm/user.h
diff --git a/include/asm-m68k/virtconvert.h b/arch/m68k/include/asm/virtconvert.h
similarity index 100%
rename from include/asm-m68k/virtconvert.h
rename to arch/m68k/include/asm/virtconvert.h
diff --git a/include/asm-m68k/xor.h b/arch/m68k/include/asm/xor.h
similarity index 100%
rename from include/asm-m68k/xor.h
rename to arch/m68k/include/asm/xor.h
diff --git a/include/asm-m68k/zorro.h b/arch/m68k/include/asm/zorro.h
similarity index 100%
rename from include/asm-m68k/zorro.h
rename to arch/m68k/include/asm/zorro.h
diff --git a/arch/m68knommu/include/asm/Kbuild b/arch/m68knommu/include/asm/Kbuild
deleted file mode 100644
index 58c02a4..0000000
--- a/arch/m68knommu/include/asm/Kbuild
+++ /dev/null
@@ -1,3 +0,0 @@
-include include/asm-generic/Kbuild.asm
-
-unifdef-y += swab.h
diff --git a/arch/m68knommu/include/asm/auxvec.h b/arch/m68knommu/include/asm/auxvec.h
deleted file mode 100644
index 844d6d5..0000000
--- a/arch/m68knommu/include/asm/auxvec.h
+++ /dev/null
@@ -1,4 +0,0 @@
-#ifndef __ASMm68k_AUXVEC_H
-#define __ASMm68k_AUXVEC_H
-
-#endif
diff --git a/arch/m68knommu/include/asm/cachectl.h b/arch/m68knommu/include/asm/cachectl.h
deleted file mode 100644
index bcf5a6a..0000000
--- a/arch/m68knommu/include/asm/cachectl.h
+++ /dev/null
@@ -1 +0,0 @@
-#include <asm-m68k/cachectl.h>
diff --git a/arch/m68knommu/include/asm/cputime.h b/arch/m68knommu/include/asm/cputime.h
deleted file mode 100644
index a0c4a66..0000000
--- a/arch/m68knommu/include/asm/cputime.h
+++ /dev/null
@@ -1,6 +0,0 @@
-#ifndef __M68KNOMMU_CPUTIME_H
-#define __M68KNOMMU_CPUTIME_H
-
-#include <asm-generic/cputime.h>
-
-#endif /* __M68KNOMMU_CPUTIME_H */
diff --git a/arch/m68knommu/include/asm/device.h b/arch/m68knommu/include/asm/device.h
deleted file mode 100644
index d8f9872..0000000
--- a/arch/m68knommu/include/asm/device.h
+++ /dev/null
@@ -1,7 +0,0 @@
-/*
- * Arch specific extensions to struct device
- *
- * This file is released under the GPLv2
- */
-#include <asm-generic/device.h>
-
diff --git a/arch/m68knommu/include/asm/emergency-restart.h b/arch/m68knommu/include/asm/emergency-restart.h
deleted file mode 100644
index 108d8c4..0000000
--- a/arch/m68knommu/include/asm/emergency-restart.h
+++ /dev/null
@@ -1,6 +0,0 @@
-#ifndef _ASM_EMERGENCY_RESTART_H
-#define _ASM_EMERGENCY_RESTART_H
-
-#include <asm-generic/emergency-restart.h>
-
-#endif /* _ASM_EMERGENCY_RESTART_H */
diff --git a/arch/m68knommu/include/asm/errno.h b/arch/m68knommu/include/asm/errno.h
deleted file mode 100644
index 7e8c22b..0000000
--- a/arch/m68knommu/include/asm/errno.h
+++ /dev/null
@@ -1 +0,0 @@
-#include <asm-m68k/errno.h>
diff --git a/arch/m68knommu/include/asm/fcntl.h b/arch/m68knommu/include/asm/fcntl.h
deleted file mode 100644
index f6a552c..0000000
--- a/arch/m68knommu/include/asm/fcntl.h
+++ /dev/null
@@ -1 +0,0 @@
-#include <asm-m68k/fcntl.h>
diff --git a/arch/m68knommu/include/asm/futex.h b/arch/m68knommu/include/asm/futex.h
deleted file mode 100644
index 6a332a9..0000000
--- a/arch/m68knommu/include/asm/futex.h
+++ /dev/null
@@ -1,6 +0,0 @@
-#ifndef _ASM_FUTEX_H
-#define _ASM_FUTEX_H
-
-#include <asm-generic/futex.h>
-
-#endif
diff --git a/arch/m68knommu/include/asm/hwtest.h b/arch/m68knommu/include/asm/hwtest.h
deleted file mode 100644
index 700626a..0000000
--- a/arch/m68knommu/include/asm/hwtest.h
+++ /dev/null
@@ -1 +0,0 @@
-#include <asm-m68k/hwtest.h>
diff --git a/arch/m68knommu/include/asm/ioctl.h b/arch/m68knommu/include/asm/ioctl.h
deleted file mode 100644
index b279fe0..0000000
--- a/arch/m68knommu/include/asm/ioctl.h
+++ /dev/null
@@ -1 +0,0 @@
-#include <asm-generic/ioctl.h>
diff --git a/arch/m68knommu/include/asm/ioctls.h b/arch/m68knommu/include/asm/ioctls.h
deleted file mode 100644
index 0b1eb4d..0000000
--- a/arch/m68knommu/include/asm/ioctls.h
+++ /dev/null
@@ -1 +0,0 @@
-#include <asm-m68k/ioctls.h>
diff --git a/arch/m68knommu/include/asm/ipcbuf.h b/arch/m68knommu/include/asm/ipcbuf.h
deleted file mode 100644
index e4a7be6..0000000
--- a/arch/m68knommu/include/asm/ipcbuf.h
+++ /dev/null
@@ -1 +0,0 @@
-#include <asm-m68k/ipcbuf.h>
diff --git a/arch/m68knommu/include/asm/irq_regs.h b/arch/m68knommu/include/asm/irq_regs.h
deleted file mode 100644
index 3dd9c0b..0000000
--- a/arch/m68knommu/include/asm/irq_regs.h
+++ /dev/null
@@ -1 +0,0 @@
-#include <asm-generic/irq_regs.h>
diff --git a/arch/m68knommu/include/asm/kdebug.h b/arch/m68knommu/include/asm/kdebug.h
deleted file mode 100644
index 6ece1b0..0000000
--- a/arch/m68knommu/include/asm/kdebug.h
+++ /dev/null
@@ -1 +0,0 @@
-#include <asm-generic/kdebug.h>
diff --git a/arch/m68knommu/include/asm/linkage.h b/arch/m68knommu/include/asm/linkage.h
deleted file mode 100644
index c288a19..0000000
--- a/arch/m68knommu/include/asm/linkage.h
+++ /dev/null
@@ -1 +0,0 @@
-#include <asm-m68k/linkage.h>
diff --git a/arch/m68knommu/include/asm/local.h b/arch/m68knommu/include/asm/local.h
deleted file mode 100644
index 84a39c1..0000000
--- a/arch/m68knommu/include/asm/local.h
+++ /dev/null
@@ -1,6 +0,0 @@
-#ifndef __M68KNOMMU_LOCAL_H
-#define __M68KNOMMU_LOCAL_H
-
-#include <asm-generic/local.h>
-
-#endif /* __M68KNOMMU_LOCAL_H */
diff --git a/arch/m68knommu/include/asm/math-emu.h b/arch/m68knommu/include/asm/math-emu.h
deleted file mode 100644
index 7e70905..0000000
--- a/arch/m68knommu/include/asm/math-emu.h
+++ /dev/null
@@ -1 +0,0 @@
-#include <asm-m68k/math-emu.h>
diff --git a/arch/m68knommu/include/asm/md.h b/arch/m68knommu/include/asm/md.h
deleted file mode 100644
index d810c78..0000000
--- a/arch/m68knommu/include/asm/md.h
+++ /dev/null
@@ -1 +0,0 @@
-#include <asm-m68k/md.h>
diff --git a/arch/m68knommu/include/asm/mman.h b/arch/m68knommu/include/asm/mman.h
deleted file mode 100644
index 4846c68..0000000
--- a/arch/m68knommu/include/asm/mman.h
+++ /dev/null
@@ -1 +0,0 @@
-#include <asm-m68k/mman.h>
diff --git a/arch/m68knommu/include/asm/movs.h b/arch/m68knommu/include/asm/movs.h
deleted file mode 100644
index 81a1677..0000000
--- a/arch/m68knommu/include/asm/movs.h
+++ /dev/null
@@ -1 +0,0 @@
-#include <asm-m68k/movs.h>
diff --git a/arch/m68knommu/include/asm/msgbuf.h b/arch/m68knommu/include/asm/msgbuf.h
deleted file mode 100644
index bdfadec4..0000000
--- a/arch/m68knommu/include/asm/msgbuf.h
+++ /dev/null
@@ -1 +0,0 @@
-#include <asm-m68k/msgbuf.h>
diff --git a/arch/m68knommu/include/asm/mutex.h b/arch/m68knommu/include/asm/mutex.h
deleted file mode 100644
index 458c1f7..0000000
--- a/arch/m68knommu/include/asm/mutex.h
+++ /dev/null
@@ -1,9 +0,0 @@
-/*
- * Pull in the generic implementation for the mutex fastpath.
- *
- * TODO: implement optimized primitives instead, or leave the generic
- * implementation in place, or pick the atomic_xchg() based generic
- * implementation. (see asm-generic/mutex-xchg.h for details)
- */
-
-#include <asm-generic/mutex-dec.h>
diff --git a/arch/m68knommu/include/asm/openprom.h b/arch/m68knommu/include/asm/openprom.h
deleted file mode 100644
index fdba795..0000000
--- a/arch/m68knommu/include/asm/openprom.h
+++ /dev/null
@@ -1 +0,0 @@
-#include <asm-m68k/openprom.h>
diff --git a/arch/m68knommu/include/asm/oplib.h b/arch/m68knommu/include/asm/oplib.h
deleted file mode 100644
index ce079dc..0000000
--- a/arch/m68knommu/include/asm/oplib.h
+++ /dev/null
@@ -1 +0,0 @@
-#include <asm-m68k/oplib.h>
diff --git a/arch/m68knommu/include/asm/percpu.h b/arch/m68knommu/include/asm/percpu.h
deleted file mode 100644
index 5de72c3..0000000
--- a/arch/m68knommu/include/asm/percpu.h
+++ /dev/null
@@ -1,6 +0,0 @@
-#ifndef __ARCH_M68KNOMMU_PERCPU__
-#define __ARCH_M68KNOMMU_PERCPU__
-
-#include <asm-generic/percpu.h>
-
-#endif /* __ARCH_M68KNOMMU_PERCPU__ */
diff --git a/arch/m68knommu/include/asm/poll.h b/arch/m68knommu/include/asm/poll.h
deleted file mode 100644
index ee1b6cb..0000000
--- a/arch/m68knommu/include/asm/poll.h
+++ /dev/null
@@ -1 +0,0 @@
-#include <asm-m68k/poll.h>
diff --git a/arch/m68knommu/include/asm/posix_types.h b/arch/m68knommu/include/asm/posix_types.h
deleted file mode 100644
index 6205fb9..0000000
--- a/arch/m68knommu/include/asm/posix_types.h
+++ /dev/null
@@ -1 +0,0 @@
-#include <asm-m68k/posix_types.h>
diff --git a/arch/m68knommu/include/asm/resource.h b/arch/m68knommu/include/asm/resource.h
deleted file mode 100644
index 7fa63d5..0000000
--- a/arch/m68knommu/include/asm/resource.h
+++ /dev/null
@@ -1 +0,0 @@
-#include <asm-m68k/resource.h>
diff --git a/arch/m68knommu/include/asm/rtc.h b/arch/m68knommu/include/asm/rtc.h
deleted file mode 100644
index eaf18ec..0000000
--- a/arch/m68knommu/include/asm/rtc.h
+++ /dev/null
@@ -1 +0,0 @@
-#include <asm-m68k/rtc.h>
diff --git a/arch/m68knommu/include/asm/sections.h b/arch/m68knommu/include/asm/sections.h
deleted file mode 100644
index dd0ecb9..0000000
--- a/arch/m68knommu/include/asm/sections.h
+++ /dev/null
@@ -1,7 +0,0 @@
-#ifndef _M68KNOMMU_SECTIONS_H
-#define _M68KNOMMU_SECTIONS_H
-
-/* nothing to see, move along */
-#include <asm-generic/sections.h>
-
-#endif
diff --git a/arch/m68knommu/include/asm/sembuf.h b/arch/m68knommu/include/asm/sembuf.h
deleted file mode 100644
index 3a634f9..0000000
--- a/arch/m68knommu/include/asm/sembuf.h
+++ /dev/null
@@ -1 +0,0 @@
-#include <asm-m68k/sembuf.h>
diff --git a/arch/m68knommu/include/asm/shm.h b/arch/m68knommu/include/asm/shm.h
deleted file mode 100644
index cc8e522..0000000
--- a/arch/m68knommu/include/asm/shm.h
+++ /dev/null
@@ -1 +0,0 @@
-#include <asm-m68k/shm.h>
diff --git a/arch/m68knommu/include/asm/shmbuf.h b/arch/m68knommu/include/asm/shmbuf.h
deleted file mode 100644
index bc34cf8..0000000
--- a/arch/m68knommu/include/asm/shmbuf.h
+++ /dev/null
@@ -1 +0,0 @@
-#include <asm-m68k/shmbuf.h>
diff --git a/arch/m68knommu/include/asm/shmparam.h b/arch/m68knommu/include/asm/shmparam.h
deleted file mode 100644
index d7ee696..0000000
--- a/arch/m68knommu/include/asm/shmparam.h
+++ /dev/null
@@ -1 +0,0 @@
-#include <asm-m68k/shmparam.h>
diff --git a/arch/m68knommu/include/asm/socket.h b/arch/m68knommu/include/asm/socket.h
deleted file mode 100644
index ac5478b..0000000
--- a/arch/m68knommu/include/asm/socket.h
+++ /dev/null
@@ -1 +0,0 @@
-#include <asm-m68k/socket.h>
diff --git a/arch/m68knommu/include/asm/sockios.h b/arch/m68knommu/include/asm/sockios.h
deleted file mode 100644
index dcc6a89..0000000
--- a/arch/m68knommu/include/asm/sockios.h
+++ /dev/null
@@ -1 +0,0 @@
-#include <asm-m68k/sockios.h>
diff --git a/arch/m68knommu/include/asm/spinlock.h b/arch/m68knommu/include/asm/spinlock.h
deleted file mode 100644
index 6bb1f06..0000000
--- a/arch/m68knommu/include/asm/spinlock.h
+++ /dev/null
@@ -1 +0,0 @@
-#include <asm-m68k/spinlock.h>
diff --git a/arch/m68knommu/include/asm/stat.h b/arch/m68knommu/include/asm/stat.h
deleted file mode 100644
index 3d4b260..0000000
--- a/arch/m68knommu/include/asm/stat.h
+++ /dev/null
@@ -1 +0,0 @@
-#include <asm-m68k/stat.h>
diff --git a/arch/m68knommu/include/asm/statfs.h b/arch/m68knommu/include/asm/statfs.h
deleted file mode 100644
index 2ce99ea..0000000
--- a/arch/m68knommu/include/asm/statfs.h
+++ /dev/null
@@ -1 +0,0 @@
-#include <asm-m68k/statfs.h>
diff --git a/arch/m68knommu/include/asm/termbits.h b/arch/m68knommu/include/asm/termbits.h
deleted file mode 100644
index 05dd6bc..0000000
--- a/arch/m68knommu/include/asm/termbits.h
+++ /dev/null
@@ -1 +0,0 @@
-#include <asm-m68k/termbits.h>
diff --git a/arch/m68knommu/include/asm/termios.h b/arch/m68knommu/include/asm/termios.h
deleted file mode 100644
index e733788..0000000
--- a/arch/m68knommu/include/asm/termios.h
+++ /dev/null
@@ -1 +0,0 @@
-#include <asm-m68k/termios.h>
diff --git a/arch/m68knommu/include/asm/tlb.h b/arch/m68knommu/include/asm/tlb.h
deleted file mode 100644
index 77a7c51..0000000
--- a/arch/m68knommu/include/asm/tlb.h
+++ /dev/null
@@ -1 +0,0 @@
-#include <asm-m68k/tlb.h>
diff --git a/arch/m68knommu/include/asm/topology.h b/arch/m68knommu/include/asm/topology.h
deleted file mode 100644
index ca173e9..0000000
--- a/arch/m68knommu/include/asm/topology.h
+++ /dev/null
@@ -1,6 +0,0 @@
-#ifndef _ASM_M68K_TOPOLOGY_H
-#define _ASM_M68K_TOPOLOGY_H
-
-#include <asm-generic/topology.h>
-
-#endif /* _ASM_M68K_TOPOLOGY_H */
diff --git a/arch/m68knommu/include/asm/types.h b/arch/m68knommu/include/asm/types.h
deleted file mode 100644
index 031238c..0000000
--- a/arch/m68knommu/include/asm/types.h
+++ /dev/null
@@ -1 +0,0 @@
-#include <asm-m68k/types.h>
diff --git a/arch/m68knommu/include/asm/user.h b/arch/m68knommu/include/asm/user.h
deleted file mode 100644
index a5a555b..0000000
--- a/arch/m68knommu/include/asm/user.h
+++ /dev/null
@@ -1 +0,0 @@
-#include <asm-m68k/user.h>
-- 
2.7.4