aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2008-08-07 18:07:33 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2008-08-07 18:07:33 -0700
commit3d8cd0c5d75c424f986c0602dc26579fbb7c8080 (patch)
tree03c61f81542f6c34e32eb5e0dfc3d34668f88fdd
parent4c514a5ad1314b872e3185dabaf105c81d39d7e8 (diff)
parent58750139001bae11a1f9b074f3a9c774fecf5ba8 (diff)
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/gerg/m68knommu
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/gerg/m68knommu: Move all of include/asm-m68knommu to arch/m68knommu/include/asm.
-rw-r--r--arch/m68knommu/include/asm/Kbuild (renamed from include/asm-m68knommu/Kbuild)0
-rw-r--r--arch/m68knommu/include/asm/MC68328.h (renamed from include/asm-m68knommu/MC68328.h)0
-rw-r--r--arch/m68knommu/include/asm/MC68332.h (renamed from include/asm-m68knommu/MC68332.h)0
-rw-r--r--arch/m68knommu/include/asm/MC68EZ328.h (renamed from include/asm-m68knommu/MC68EZ328.h)0
-rw-r--r--arch/m68knommu/include/asm/MC68VZ328.h (renamed from include/asm-m68knommu/MC68VZ328.h)0
-rw-r--r--arch/m68knommu/include/asm/a.out.h (renamed from include/asm-m68knommu/a.out.h)0
-rw-r--r--arch/m68knommu/include/asm/anchor.h (renamed from include/asm-m68knommu/anchor.h)0
-rw-r--r--arch/m68knommu/include/asm/atomic.h (renamed from include/asm-m68knommu/atomic.h)0
-rw-r--r--arch/m68knommu/include/asm/auxvec.h (renamed from include/asm-m68knommu/auxvec.h)0
-rw-r--r--arch/m68knommu/include/asm/bitops.h (renamed from include/asm-m68knommu/bitops.h)0
-rw-r--r--arch/m68knommu/include/asm/bootinfo.h (renamed from include/asm-m68knommu/bootinfo.h)0
-rw-r--r--arch/m68knommu/include/asm/bootstd.h (renamed from include/asm-m68knommu/bootstd.h)0
-rw-r--r--arch/m68knommu/include/asm/bug.h (renamed from include/asm-m68knommu/bug.h)0
-rw-r--r--arch/m68knommu/include/asm/bugs.h (renamed from include/asm-m68knommu/bugs.h)0
-rw-r--r--arch/m68knommu/include/asm/byteorder.h (renamed from include/asm-m68knommu/byteorder.h)0
-rw-r--r--arch/m68knommu/include/asm/cache.h (renamed from include/asm-m68knommu/cache.h)0
-rw-r--r--arch/m68knommu/include/asm/cachectl.h (renamed from include/asm-m68knommu/cachectl.h)0
-rw-r--r--arch/m68knommu/include/asm/cacheflush.h (renamed from include/asm-m68knommu/cacheflush.h)0
-rw-r--r--arch/m68knommu/include/asm/checksum.h (renamed from include/asm-m68knommu/checksum.h)0
-rw-r--r--arch/m68knommu/include/asm/coldfire.h (renamed from include/asm-m68knommu/coldfire.h)0
-rw-r--r--arch/m68knommu/include/asm/commproc.h (renamed from include/asm-m68knommu/commproc.h)0
-rw-r--r--arch/m68knommu/include/asm/cputime.h (renamed from include/asm-m68knommu/cputime.h)0
-rw-r--r--arch/m68knommu/include/asm/current.h (renamed from include/asm-m68knommu/current.h)0
-rw-r--r--arch/m68knommu/include/asm/dbg.h (renamed from include/asm-m68knommu/dbg.h)0
-rw-r--r--arch/m68knommu/include/asm/delay.h (renamed from include/asm-m68knommu/delay.h)0
-rw-r--r--arch/m68knommu/include/asm/device.h (renamed from include/asm-m68knommu/device.h)0
-rw-r--r--arch/m68knommu/include/asm/div64.h (renamed from include/asm-m68knommu/div64.h)0
-rw-r--r--arch/m68knommu/include/asm/dma-mapping.h (renamed from include/asm-m68knommu/dma-mapping.h)0
-rw-r--r--arch/m68knommu/include/asm/dma.h (renamed from include/asm-m68knommu/dma.h)0
-rw-r--r--arch/m68knommu/include/asm/elf.h (renamed from include/asm-m68knommu/elf.h)0
-rw-r--r--arch/m68knommu/include/asm/elia.h (renamed from include/asm-m68knommu/elia.h)0
-rw-r--r--arch/m68knommu/include/asm/emergency-restart.h (renamed from include/asm-m68knommu/emergency-restart.h)0
-rw-r--r--arch/m68knommu/include/asm/entry.h (renamed from include/asm-m68knommu/entry.h)0
-rw-r--r--arch/m68knommu/include/asm/errno.h (renamed from include/asm-m68knommu/errno.h)0
-rw-r--r--arch/m68knommu/include/asm/fb.h (renamed from include/asm-m68knommu/fb.h)0
-rw-r--r--arch/m68knommu/include/asm/fcntl.h (renamed from include/asm-m68knommu/fcntl.h)0
-rw-r--r--arch/m68knommu/include/asm/flat.h (renamed from include/asm-m68knommu/flat.h)0
-rw-r--r--arch/m68knommu/include/asm/fpu.h (renamed from include/asm-m68knommu/fpu.h)0
-rw-r--r--arch/m68knommu/include/asm/futex.h (renamed from include/asm-m68knommu/futex.h)0
-rw-r--r--arch/m68knommu/include/asm/hardirq.h (renamed from include/asm-m68knommu/hardirq.h)0
-rw-r--r--arch/m68knommu/include/asm/hw_irq.h (renamed from include/asm-m68knommu/hw_irq.h)0
-rw-r--r--arch/m68knommu/include/asm/hwtest.h (renamed from include/asm-m68knommu/hwtest.h)0
-rw-r--r--arch/m68knommu/include/asm/io.h (renamed from include/asm-m68knommu/io.h)0
-rw-r--r--arch/m68knommu/include/asm/ioctl.h (renamed from include/asm-m68knommu/ioctl.h)0
-rw-r--r--arch/m68knommu/include/asm/ioctls.h (renamed from include/asm-m68knommu/ioctls.h)0
-rw-r--r--arch/m68knommu/include/asm/ipcbuf.h (renamed from include/asm-m68knommu/ipcbuf.h)0
-rw-r--r--arch/m68knommu/include/asm/irq.h (renamed from include/asm-m68knommu/irq.h)0
-rw-r--r--arch/m68knommu/include/asm/irq_regs.h (renamed from include/asm-m68knommu/irq_regs.h)0
-rw-r--r--arch/m68knommu/include/asm/kdebug.h (renamed from include/asm-m68knommu/kdebug.h)0
-rw-r--r--arch/m68knommu/include/asm/kmap_types.h (renamed from include/asm-m68knommu/kmap_types.h)0
-rw-r--r--arch/m68knommu/include/asm/linkage.h (renamed from include/asm-m68knommu/linkage.h)0
-rw-r--r--arch/m68knommu/include/asm/local.h (renamed from include/asm-m68knommu/local.h)0
-rw-r--r--arch/m68knommu/include/asm/m5206sim.h (renamed from include/asm-m68knommu/m5206sim.h)0
-rw-r--r--arch/m68knommu/include/asm/m520xsim.h (renamed from include/asm-m68knommu/m520xsim.h)0
-rw-r--r--arch/m68knommu/include/asm/m523xsim.h (renamed from include/asm-m68knommu/m523xsim.h)0
-rw-r--r--arch/m68knommu/include/asm/m5249sim.h (renamed from include/asm-m68knommu/m5249sim.h)0
-rw-r--r--arch/m68knommu/include/asm/m5272sim.h (renamed from include/asm-m68knommu/m5272sim.h)0
-rw-r--r--arch/m68knommu/include/asm/m527xsim.h (renamed from include/asm-m68knommu/m527xsim.h)0
-rw-r--r--arch/m68knommu/include/asm/m528xsim.h (renamed from include/asm-m68knommu/m528xsim.h)0
-rw-r--r--arch/m68knommu/include/asm/m5307sim.h (renamed from include/asm-m68knommu/m5307sim.h)0
-rw-r--r--arch/m68knommu/include/asm/m532xsim.h (renamed from include/asm-m68knommu/m532xsim.h)0
-rw-r--r--arch/m68knommu/include/asm/m5407sim.h (renamed from include/asm-m68knommu/m5407sim.h)0
-rw-r--r--arch/m68knommu/include/asm/m68360.h (renamed from include/asm-m68knommu/m68360.h)0
-rw-r--r--arch/m68knommu/include/asm/m68360_enet.h (renamed from include/asm-m68knommu/m68360_enet.h)0
-rw-r--r--arch/m68knommu/include/asm/m68360_pram.h (renamed from include/asm-m68knommu/m68360_pram.h)0
-rw-r--r--arch/m68knommu/include/asm/m68360_quicc.h (renamed from include/asm-m68knommu/m68360_quicc.h)0
-rw-r--r--arch/m68knommu/include/asm/m68360_regs.h (renamed from include/asm-m68knommu/m68360_regs.h)0
-rw-r--r--arch/m68knommu/include/asm/machdep.h (renamed from include/asm-m68knommu/machdep.h)0
-rw-r--r--arch/m68knommu/include/asm/math-emu.h (renamed from include/asm-m68knommu/math-emu.h)0
-rw-r--r--arch/m68knommu/include/asm/mc146818rtc.h (renamed from include/asm-m68knommu/mc146818rtc.h)0
-rw-r--r--arch/m68knommu/include/asm/mcfcache.h (renamed from include/asm-m68knommu/mcfcache.h)0
-rw-r--r--arch/m68knommu/include/asm/mcfdma.h (renamed from include/asm-m68knommu/mcfdma.h)0
-rw-r--r--arch/m68knommu/include/asm/mcfmbus.h (renamed from include/asm-m68knommu/mcfmbus.h)0
-rw-r--r--arch/m68knommu/include/asm/mcfne.h (renamed from include/asm-m68knommu/mcfne.h)0
-rw-r--r--arch/m68knommu/include/asm/mcfpci.h (renamed from include/asm-m68knommu/mcfpci.h)0
-rw-r--r--arch/m68knommu/include/asm/mcfpit.h (renamed from include/asm-m68knommu/mcfpit.h)0
-rw-r--r--arch/m68knommu/include/asm/mcfsim.h (renamed from include/asm-m68knommu/mcfsim.h)0
-rw-r--r--arch/m68knommu/include/asm/mcfsmc.h (renamed from include/asm-m68knommu/mcfsmc.h)0
-rw-r--r--arch/m68knommu/include/asm/mcftimer.h (renamed from include/asm-m68knommu/mcftimer.h)0
-rw-r--r--arch/m68knommu/include/asm/mcfuart.h (renamed from include/asm-m68knommu/mcfuart.h)0
-rw-r--r--arch/m68knommu/include/asm/mcfwdebug.h (renamed from include/asm-m68knommu/mcfwdebug.h)0
-rw-r--r--arch/m68knommu/include/asm/md.h (renamed from include/asm-m68knommu/md.h)0
-rw-r--r--arch/m68knommu/include/asm/mman.h (renamed from include/asm-m68knommu/mman.h)0
-rw-r--r--arch/m68knommu/include/asm/mmu.h (renamed from include/asm-m68knommu/mmu.h)0
-rw-r--r--arch/m68knommu/include/asm/mmu_context.h (renamed from include/asm-m68knommu/mmu_context.h)0
-rw-r--r--arch/m68knommu/include/asm/module.h (renamed from include/asm-m68knommu/module.h)0
-rw-r--r--arch/m68knommu/include/asm/movs.h (renamed from include/asm-m68knommu/movs.h)0
-rw-r--r--arch/m68knommu/include/asm/msgbuf.h (renamed from include/asm-m68knommu/msgbuf.h)0
-rw-r--r--arch/m68knommu/include/asm/mutex.h (renamed from include/asm-m68knommu/mutex.h)0
-rw-r--r--arch/m68knommu/include/asm/nettel.h (renamed from include/asm-m68knommu/nettel.h)0
-rw-r--r--arch/m68knommu/include/asm/openprom.h (renamed from include/asm-m68knommu/openprom.h)0
-rw-r--r--arch/m68knommu/include/asm/oplib.h (renamed from include/asm-m68knommu/oplib.h)0
-rw-r--r--arch/m68knommu/include/asm/page.h (renamed from include/asm-m68knommu/page.h)0
-rw-r--r--arch/m68knommu/include/asm/page_offset.h (renamed from include/asm-m68knommu/page_offset.h)0
-rw-r--r--arch/m68knommu/include/asm/param.h (renamed from include/asm-m68knommu/param.h)0
-rw-r--r--arch/m68knommu/include/asm/pci.h (renamed from include/asm-m68knommu/pci.h)0
-rw-r--r--arch/m68knommu/include/asm/percpu.h (renamed from include/asm-m68knommu/percpu.h)0
-rw-r--r--arch/m68knommu/include/asm/pgalloc.h (renamed from include/asm-m68knommu/pgalloc.h)0
-rw-r--r--arch/m68knommu/include/asm/pgtable.h (renamed from include/asm-m68knommu/pgtable.h)0
-rw-r--r--arch/m68knommu/include/asm/poll.h (renamed from include/asm-m68knommu/poll.h)0
-rw-r--r--arch/m68knommu/include/asm/posix_types.h (renamed from include/asm-m68knommu/posix_types.h)0
-rw-r--r--arch/m68knommu/include/asm/processor.h (renamed from include/asm-m68knommu/processor.h)0
-rw-r--r--arch/m68knommu/include/asm/ptrace.h (renamed from include/asm-m68knommu/ptrace.h)0
-rw-r--r--arch/m68knommu/include/asm/quicc_simple.h (renamed from include/asm-m68knommu/quicc_simple.h)0
-rw-r--r--arch/m68knommu/include/asm/resource.h (renamed from include/asm-m68knommu/resource.h)0
-rw-r--r--arch/m68knommu/include/asm/rtc.h (renamed from include/asm-m68knommu/rtc.h)0
-rw-r--r--arch/m68knommu/include/asm/scatterlist.h (renamed from include/asm-m68knommu/scatterlist.h)0
-rw-r--r--arch/m68knommu/include/asm/sections.h (renamed from include/asm-m68knommu/sections.h)0
-rw-r--r--arch/m68knommu/include/asm/segment.h (renamed from include/asm-m68knommu/segment.h)0
-rw-r--r--arch/m68knommu/include/asm/sembuf.h (renamed from include/asm-m68knommu/sembuf.h)0
-rw-r--r--arch/m68knommu/include/asm/setup.h (renamed from include/asm-m68knommu/setup.h)0
-rw-r--r--arch/m68knommu/include/asm/shm.h (renamed from include/asm-m68knommu/shm.h)0
-rw-r--r--arch/m68knommu/include/asm/shmbuf.h (renamed from include/asm-m68knommu/shmbuf.h)0
-rw-r--r--arch/m68knommu/include/asm/shmparam.h (renamed from include/asm-m68knommu/shmparam.h)0
-rw-r--r--arch/m68knommu/include/asm/sigcontext.h (renamed from include/asm-m68knommu/sigcontext.h)0
-rw-r--r--arch/m68knommu/include/asm/siginfo.h (renamed from include/asm-m68knommu/siginfo.h)0
-rw-r--r--arch/m68knommu/include/asm/signal.h (renamed from include/asm-m68knommu/signal.h)0
-rw-r--r--arch/m68knommu/include/asm/smp.h (renamed from include/asm-m68knommu/smp.h)0
-rw-r--r--arch/m68knommu/include/asm/socket.h (renamed from include/asm-m68knommu/socket.h)0
-rw-r--r--arch/m68knommu/include/asm/sockios.h (renamed from include/asm-m68knommu/sockios.h)0
-rw-r--r--arch/m68knommu/include/asm/spinlock.h (renamed from include/asm-m68knommu/spinlock.h)0
-rw-r--r--arch/m68knommu/include/asm/stat.h (renamed from include/asm-m68knommu/stat.h)0