diff options
-rw-r--r-- | Makefile | 4 | ||||
-rw-r--r-- | arch/m68k/include/asm/Kbuild (renamed from include/asm-m68k/Kbuild) | 0 | ||||
-rw-r--r-- | arch/m68k/include/asm/MC68328.h (renamed from arch/m68knommu/include/asm/MC68328.h) | 0 | ||||
-rw-r--r-- | arch/m68k/include/asm/MC68332.h (renamed from arch/m68knommu/include/asm/MC68332.h) | 0 | ||||
-rw-r--r-- | arch/m68k/include/asm/MC68EZ328.h (renamed from arch/m68knommu/include/asm/MC68EZ328.h) | 0 | ||||
-rw-r--r-- | arch/m68k/include/asm/MC68VZ328.h (renamed from arch/m68knommu/include/asm/MC68VZ328.h) | 0 | ||||
-rw-r--r-- | arch/m68k/include/asm/a.out-core.h (renamed from include/asm-m68k/a.out-core.h) | 0 | ||||
-rw-r--r-- | arch/m68k/include/asm/a.out.h (renamed from include/asm-m68k/a.out.h) | 0 | ||||
-rw-r--r-- | arch/m68k/include/asm/adb_iop.h (renamed from include/asm-m68k/adb_iop.h) | 0 | ||||
-rw-r--r-- | arch/m68k/include/asm/amigahw.h (renamed from include/asm-m68k/amigahw.h) | 0 | ||||
-rw-r--r-- | arch/m68k/include/asm/amigaints.h (renamed from include/asm-m68k/amigaints.h) | 0 | ||||
-rw-r--r-- | arch/m68k/include/asm/amigayle.h (renamed from include/asm-m68k/amigayle.h) | 0 | ||||
-rw-r--r-- | arch/m68k/include/asm/amipcmcia.h (renamed from include/asm-m68k/amipcmcia.h) | 0 | ||||
-rw-r--r-- | arch/m68k/include/asm/anchor.h (renamed from arch/m68knommu/include/asm/anchor.h) | 0 | ||||
-rw-r--r-- | arch/m68k/include/asm/apollodma.h (renamed from include/asm-m68k/apollodma.h) | 0 | ||||
-rw-r--r-- | arch/m68k/include/asm/apollohw.h (renamed from include/asm-m68k/apollohw.h) | 0 | ||||
-rw-r--r-- | arch/m68k/include/asm/atafd.h (renamed from include/asm-m68k/atafd.h) | 0 | ||||
-rw-r--r-- | arch/m68k/include/asm/atafdreg.h (renamed from include/asm-m68k/atafdreg.h) | 0 | ||||
-rw-r--r-- | arch/m68k/include/asm/atari_joystick.h (renamed from include/asm-m68k/atari_joystick.h) | 0 | ||||
-rw-r--r-- | arch/m68k/include/asm/atari_stdma.h (renamed from include/asm-m68k/atari_stdma.h) | 0 | ||||
-rw-r--r-- | arch/m68k/include/asm/atari_stram.h (renamed from include/asm-m68k/atari_stram.h) | 0 | ||||
-rw-r--r-- | arch/m68k/include/asm/atarihw.h (renamed from include/asm-m68k/atarihw.h) | 0 | ||||
-rw-r--r-- | arch/m68k/include/asm/atariints.h (renamed from include/asm-m68k/atariints.h) | 0 | ||||
-rw-r--r-- | arch/m68k/include/asm/atarikb.h (renamed from include/asm-m68k/atarikb.h) | 0 | ||||
-rw-r--r-- | arch/m68k/include/asm/atomic.h | 5 | ||||
-rw-r--r-- | arch/m68k/include/asm/atomic_mm.h (renamed from include/asm-m68k/atomic.h) | 0 | ||||
-rw-r--r-- | arch/m68k/include/asm/atomic_no.h (renamed from arch/m68knommu/include/asm/atomic.h) | 0 | ||||
-rw-r--r-- | arch/m68k/include/asm/auxvec.h (renamed from arch/m68knommu/include/asm/auxvec.h) | 0 | ||||
-rw-r--r-- | arch/m68k/include/asm/bitops.h | 5 | ||||
-rw-r--r-- | arch/m68k/include/asm/bitops_mm.h (renamed from include/asm-m68k/bitops.h) | 0 | ||||
-rw-r--r-- | arch/m68k/include/asm/bitops_no.h (renamed from arch/m68knommu/include/asm/bitops.h) | 0 | ||||
-rw-r--r-- | arch/m68k/include/asm/blinken.h (renamed from include/asm-m68k/blinken.h) | 0 | ||||
-rw-r--r-- | arch/m68k/include/asm/bootinfo.h | 5 | ||||
-rw-r--r-- | arch/m68k/include/asm/bootinfo_mm.h (renamed from include/asm-m68k/bootinfo.h) | 0 | ||||
-rw-r--r-- | arch/m68k/include/asm/bootinfo_no.h (renamed from arch/m68knommu/include/asm/bootinfo.h) | 0 | ||||
-rw-r--r-- | arch/m68k/include/asm/bootstd.h (renamed from arch/m68knommu/include/asm/bootstd.h) | 0 | ||||
-rw-r--r-- | arch/m68k/include/asm/bug.h | 5 | ||||
-rw-r--r-- | arch/m68k/include/asm/bug_mm.h (renamed from include/asm-m68k/bug.h) | 0 | ||||
-rw-r--r-- | arch/m68k/include/asm/bug_no.h (renamed from arch/m68knommu/include/asm/bug.h) | 0 | ||||
-rw-r--r-- | arch/m68k/include/asm/bugs.h | 5 | ||||
-rw-r--r-- | arch/m68k/include/asm/bugs_mm.h (renamed from include/asm-m68k/bugs.h) | 0 | ||||
-rw-r--r-- | arch/m68k/include/asm/bugs_no.h (renamed from arch/m68knommu/include/asm/bugs.h) | 0 | ||||
-rw-r--r-- | arch/m68k/include/asm/bvme6000hw.h (renamed from include/asm-m68k/bvme6000hw.h) | 0 | ||||
-rw-r--r-- | arch/m68k/include/asm/byteorder.h | 5 | ||||
-rw-r--r-- | arch/m68k/include/asm/byteorder_mm.h (renamed from include/asm-m68k/byteorder.h) | 0 | ||||
-rw-r--r-- | arch/m68k/include/asm/byteorder_no.h (renamed from arch/m68knommu/include/asm/byteorder.h) | 0 | ||||
-rw-r--r-- | arch/m68k/include/asm/cache.h | 5 | ||||
-rw-r--r-- | arch/m68k/include/asm/cache_mm.h (renamed from include/asm-m68k/cache.h) | 0 | ||||
-rw-r--r-- | arch/m68k/include/asm/cache_no.h (renamed from arch/m68knommu/include/asm/cache.h) | 0 | ||||
-rw-r--r-- | arch/m68k/include/asm/cachectl.h (renamed from include/asm-m68k/cachectl.h) | 0 | ||||
-rw-r--r-- | arch/m68k/include/asm/cacheflush.h | 5 | ||||
-rw-r--r-- | arch/m68k/include/asm/cacheflush_mm.h (renamed from include/asm-m68k/cacheflush.h) | 0 | ||||
-rw-r--r-- | arch/m68k/include/asm/cacheflush_no.h (renamed from arch/m68knommu/include/asm/cacheflush.h) | 0 | ||||
-rw-r--r-- | arch/m68k/include/asm/checksum.h | 5 | ||||
-rw-r--r-- | arch/m68k/include/asm/checksum_mm.h (renamed from include/asm-m68k/checksum.h) | 0 | ||||
-rw-r--r-- | arch/m68k/include/asm/checksum_no.h (renamed from arch/m68knommu/include/asm/checksum.h) | 0 | ||||
-rw-r--r-- | arch/m68k/include/asm/coldfire.h (renamed from arch/m68knommu/include/asm/coldfire.h) | 0 | ||||
-rw-r--r-- | arch/m68k/include/asm/commproc.h (renamed from arch/m68knommu/include/asm/commproc.h) | 0 | ||||
-rw-r--r-- | arch/m68k/include/asm/contregs.h (renamed from include/asm-m68k/contregs.h) | 0 | ||||
-rw-r--r-- | arch/m68k/include/asm/cputime.h (renamed from include/asm-m68k/cputime.h) | 0 | ||||
-rw-r--r-- | arch/m68k/include/asm/current.h | 5 | ||||
-rw-r--r-- | arch/m68k/include/asm/current_mm.h (renamed from include/asm-m68k/current.h) | 0 | ||||
-rw-r--r-- | arch/m68k/include/asm/current_no.h (renamed from arch/m68knommu/include/asm/current.h) | 0 | ||||
-rw-r--r-- | arch/m68k/include/asm/dbg.h (renamed from arch/m68knommu/include/asm/dbg.h) | 0 | ||||
-rw-r--r-- | arch/m68k/include/asm/delay.h | 5 | ||||
-rw-r--r-- | arch/m68k/include/asm/delay_mm.h (renamed from include/asm-m68k/delay.h) | 0 | ||||
-rw-r--r-- | arch/m68k/include/asm/delay_no.h (renamed from arch/m68knommu/include/asm/delay.h) | 0 | ||||
-rw-r--r-- | arch/m68k/include/asm/device.h (renamed from arch/m68knommu/include/asm/device.h) | 0 | ||||
-rw-r--r-- | arch/m68k/include/asm/div64.h | 5 | ||||
-rw-r--r-- | arch/m68k/include/asm/div64_mm.h (renamed from include/asm-m68k/div64.h) | 0 | ||||
-rw-r--r-- | arch/m68k/include/asm/div64_no.h (renamed from arch/m68knommu/include/asm/div64.h) | 0 | ||||
-rw-r--r-- | arch/m68k/include/asm/dma-mapping.h | 5 | ||||
-rw-r--r-- | arch/m68k/include/asm/dma-mapping_mm.h (renamed from include/asm-m68k/dma-mapping.h) | 0 | ||||
-rw-r--r-- | arch/m68k/include/asm/dma-mapping_no.h (renamed from arch/m68knommu/include/asm/dma-mapping.h) | 0 | ||||
-rw-r--r-- | arch/m68k/include/asm/dma.h | 5 | ||||
-rw-r--r-- | arch/m68k/include/asm/dma_mm.h (renamed from include/asm-m68k/dma.h) | 0 | ||||
-rw-r--r-- | arch/m68k/include/asm/dma_no.h (renamed from arch/m68knommu/include/asm/dma.h) | 0 | ||||
-rw-r--r-- | arch/m68k/include/asm/dsp56k.h (renamed from include/asm-m68k/dsp56k.h) | 0 | ||||
-rw-r--r-- | arch/m68k/include/asm/dvma.h (renamed from include/asm-m68k/dvma.h) | 0 | ||||
-rw-r--r-- | arch/m68k/include/asm/elf.h | 5 | ||||
-rw-r--r-- | arch/m68k/include/asm/elf_mm.h (renamed from include/asm-m68k/elf.h) | 0 | ||||
-rw-r--r-- | arch/m68k/include/asm/elf_no.h (renamed from arch/m68knommu/include/asm/elf.h) | 0 | ||||
-rw-r--r-- | arch/m68k/include/asm/elia.h (renamed from arch/m68knommu/include/asm/elia.h) | 0 | ||||
-rw-r--r-- | arch/m68k/include/asm/emergency-restart.h (renamed from arch/m68knommu/include/asm/emergency-restart.h) | 0 | ||||
-rw-r--r-- | arch/m68k/include/asm/entry.h | 5 | ||||
-rw-r--r-- | arch/m68k/include/asm/entry_mm.h (renamed from include/asm-m68k/entry.h) | 0 | ||||
-rw-r--r-- | arch/m68k/include/asm/entry_no.h (renamed from arch/m68knommu/include/asm/entry.h) | 0 | ||||
-rw-r--r-- | arch/m68k/include/asm/errno.h (renamed from include/asm-m68k/errno.h) | 0 | ||||
-rw-r--r-- | arch/m68k/include/asm/fb.h | 5 | ||||
-rw-r--r-- | arch/m68k/include/asm/fb_mm.h (renamed from include/asm-m68k/fb.h) | 0 | ||||
-rw-r--r-- | arch/m68k/include/asm/fb_no.h (renamed from arch/m68knommu/include/asm/fb.h) | 0 | ||||
-rw-r--r-- | arch/m68k/include/asm/fbio.h (renamed from include/asm-m68k/fbio.h) | 0 | ||||
-rw-r--r-- | arch/m68k/include/asm/fcntl.h (renamed from include/asm-m68k/fcntl.h) | 0 | ||||
-rw-r--r-- | arch/m68k/include/asm/flat.h (renamed from arch/m68knommu/include/asm/flat.h) | 0 | ||||
-rw-r--r-- | arch/m68k/include/asm/floppy.h (renamed from include/asm-m68k/floppy.h) | 0 | ||||
-rw-r--r-- | arch/m68k/include/asm/fpu.h | 5 | ||||
-rw-r--r-- | arch/m68k/include/asm/fpu_mm.h (renamed from include/asm-m68k/fpu.h) | 0 | ||||
-rw-r--r-- | arch/m68k/include/asm/fpu_no.h (renamed from arch/m68knommu/include/asm/fpu.h) | 0 | ||||
-rw-r--r-- | arch/m68k/include/asm/futex.h (renamed from arch/m68knommu/include/asm/futex.h) | 0 | ||||
-rw-r--r-- | arch/m68k/include/asm/hardirq.h | 5 | ||||
-rw-r--r-- | arch/m68k/include/asm/hardirq_mm.h (renamed from include/asm-m68k/hardirq.h) | 0 | ||||
-rw-r--r-- | arch/m68k/include/asm/hardirq_no.h (renamed from arch/m68knommu/include/asm/hardirq.h) | 0 | ||||
-rw-r--r-- | arch/m68k/include/asm/hp300hw.h (renamed from include/asm-m68k/hp300hw.h) | 0 | ||||
-rw-r--r-- | arch/m68k/include/asm/hw_irq.h | 5 | ||||
-rw-r--r-- | arch/m68k/include/asm/hw_irq_mm.h (renamed from include/asm-m68k/hw_irq.h) | 0 | ||||
-rw-r--r-- | arch/m68k/include/asm/hw_irq_no.h (renamed from arch/m68knommu/include/asm/hw_irq.h) | 0 | ||||
-rw-r--r-- | arch/m68k/include/asm/hwtest.h (renamed from include/asm-m68k/hwtest.h) | 0 | ||||
-rw-r--r-- | arch/m68k/include/asm/ide.h (renamed from include/asm-m68k/ide.h) | 0 | ||||
-rw-r--r-- | arch/m68k/include/asm/idprom.h (renamed from include/asm-m68k/idprom.h) | 0 | ||||
-rw-r--r-- | arch/m68k/include/asm/intersil.h (renamed from include/asm-m68k/intersil.h) | 0 | ||||
-rw-r--r-- | arch/m68k/include/asm/io.h | 5 | ||||
-rw-r--r-- | arch/m68k/include/asm/io_mm.h (renamed from include/asm-m68k/io.h) | 0 | ||||
-rw-r--r-- | arch/m68k/include/asm/io_no.h (renamed from arch/m68knommu/include/asm/io.h) | 0 | ||||
-rw-r--r-- | arch/m68k/include/asm/ioctl.h (renamed from arch/m68knommu/include/asm/ioctl.h) | 0 | ||||
-rw-r--r-- | arch/m68k/include/asm/ioctls.h (renamed from include/asm-m68k/ioctls.h) | 0 | ||||
-rw-r--r-- | arch/m68k/include/asm/ipcbuf.h (renamed from include/asm-m68k/ipcbuf.h) | 0 | ||||
-rw-r--r-- | arch/m68k/include/asm/irq.h | 5 | ||||
-rw-r--r-- | arch/m68k/include/asm/irq_mm.h (renamed from include/asm-m68k/irq.h) | 0 | ||||
-rw-r--r-- | arch/m68k/include/asm/irq_no.h (renamed from arch/m68knommu/include/asm/irq.h) | 0 | ||||
-rw-r--r-- | arch/m68k/include/asm/irq_regs.h (renamed from arch/m68knommu/include/asm/irq_regs.h) | 0 | ||||
-rw-r--r-- | arch/m68k/include/asm/kdebug.h (renamed from arch/m68knommu/include/asm/kdebug.h) | 0 | ||||
-rw-r--r-- | arch/m68k/include/asm/kmap_types.h | 5 | ||||
-rw-r--r-- | arch/m68k/include/asm/kmap_types_mm.h (renamed from include/asm-m68k/kmap_types.h) | 0 | ||||
-rw-r--r-- | arch/m68k/include/asm/kmap_types_no.h (renamed from arch/m68knommu/include/asm/kmap_types.h) | 0 | ||||
-rw-r--r-- | arch/m68k/include/asm/linkage.h (renamed from include/asm-m68k/linkage.h) | 0 | ||||
-rw-r--r-- | arch/m68k/include/asm/local.h (renamed from include/asm-m68k/local.h) | 0 | ||||
-rw-r--r-- | arch/m68k/include/asm/m5206sim.h (renamed from arch/m68knommu/include/asm/m5206sim.h) | 0 | ||||
-rw-r--r-- | arch/m68k/include/asm/m520xsim.h (renamed from arch/m68knommu/include/asm/m520xsim.h) | 0 | ||||
-rw-r--r-- | arch/m68k/include/asm/m523xsim.h (renamed from arch/m68knommu/include/asm/m523xsim.h) | 0 | ||||
-rw-r--r-- | arch/m68k/include/asm/m5249sim.h (renamed from arch/m68knommu/include/asm/m5249sim.h) | 0 | ||||
-rw-r--r-- | arch/m68k/include/asm/m5272sim.h (renamed from arch/m68knommu/include/asm/m5272sim.h) | 0 | ||||
-rw-r--r-- | arch/m68k/include/asm/m527xsim.h (renamed from arch/m68knommu/include/asm/m527xsim.h) | 0 | ||||
-rw-r--r-- | arch/m68k/include/asm/m528xsim.h (renamed from arch/m68knommu/include/asm/m528xsim.h) | 0 | ||||
-rw-r--r-- | arch/m68k/include/asm/m5307sim.h (renamed from arch/m68knommu/include/asm/m5307sim.h) | 0 | ||||
-rw-r--r-- | arch/m68k/include/asm/m532xsim.h (renamed from arch/m68knommu/include/asm/m532xsim.h) | 0 | ||||
-rw-r--r-- | arch/m68k/include/asm/m5407sim.h (renamed from arch/m68knommu/include/asm/m5407sim.h) | 0 | ||||
-rw-r--r-- | arch/m68k/include/asm/m68360.h (renamed from arch/m68knommu/include/asm/m68360.h) | 0 | ||||
-rw-r--r-- | arch/m68k/include/asm/m68360_enet.h (renamed from arch/m68knommu/include/asm/m68360_enet.h) | 0 | ||||
-rw-r--r-- | arch/m68k/include/asm/m68360_pram.h (renamed from arch/m68knommu/include/asm/m68360_pram.h) | 0 | ||||
-rw-r--r-- | arch/m68k/include/asm/m68360_quicc.h (renamed from arch/m68knommu/include/asm/m68360_quicc.h) | 0 | ||||
-rw-r--r-- | arch/m68k/include/asm/m68360_regs.h (renamed from arch/m68knommu/include/asm/m68360_regs.h) | 0 | ||||
-rw-r--r-- | arch/m68k/include/asm/mac_asc.h (renamed from include/asm-m68k/mac_asc.h) | 0 | ||||
-rw-r--r-- | arch/m68k/include/asm/mac_baboon.h (renamed from include/asm-m68k/mac_baboon.h) | 0 | ||||
-rw-r--r-- | arch/m68k/include/asm/mac_iop.h (renamed from include/asm-m68k/mac_iop.h) | 0 | ||||
-rw-r--r-- | arch/m68k/include/asm/mac_mouse.h (renamed from include/asm-m68k/mac_mouse.h) | 0 | ||||
-rw-r--r-- | arch/m68k/include/asm/mac_oss.h (renamed from include/asm-m68k/mac_oss.h) | 0 | ||||
-rw-r--r-- | arch/m68k/include/asm/mac_psc.h (renamed from include/asm-m68k/mac_psc.h) | 0 | ||||
-rw-r--r-- | arch/m68k/include/asm/mac_via.h (renamed from include/asm-m68k/mac_via.h) | 0 | ||||
-rw-r--r-- | arch/m68k/include/asm/machdep.h | 5 | ||||
-rw-r--r-- | arch/m68k/include/asm/machdep_mm.h (renamed from include/asm-m68k/machdep.h) | 0 | ||||
-rw-r--r-- | arch/m68k/include/asm/machdep_no.h (renamed from arch/m68knommu/include/asm/machdep.h) | 0 | ||||
-rw-r--r-- | arch/m68k/include/asm/machines.h (renamed from include/asm-m68k/machines.h) | 0 | ||||
-rw-r--r-- | arch/m68k/include/asm/machw.h (renamed from include/asm-m68k/machw.h) | 0 | ||||
-rw-r--r-- | arch/m68k/include/asm/macintosh.h (renamed from include/asm-m68k/macintosh.h) | 0 | ||||
-rw-r--r-- | arch/m68k/include/asm/macints.h (renamed from include/asm-m68k/macints.h) | 0 | ||||
-rw-r--r-- | arch/m68k/include/asm/math-emu.h (renamed from include/asm-m68k/math-emu.h) | 0 | ||||
-rw-r--r-- | arch/m68k/include/asm/mc146818rtc.h | 5 | ||||
-rw-r--r-- | arch/m68k/include/asm/mc146818rtc_mm.h (renamed from include/asm-m68k/mc146818rtc.h) | 0 | ||||
-rw-r--r-- | arch/m68k/include/asm/mc146818rtc_no.h (renamed from arch/m68knommu/include/asm/mc146818rtc.h) | 0 | ||||
-rw-r--r-- | arch/m68k/include/asm/mcfcache.h (renamed from arch/m68knommu/include/asm/mcfcache.h) | 0 | ||||
-rw-r--r-- | arch/m68k/include/asm/mcfdma.h (renamed from arch/m68knommu/include/asm/mcfdma.h) | 0 | ||||
-rw-r--r-- | arch/m68k/include/asm/mcfmbus.h (renamed from arch/m68knommu/include/asm/mcfmbus.h) | 0 | ||||
-rw-r--r-- | arch/m68k/include/asm/mcfne.h (renamed from arch/m68knommu/include/asm/mcfne.h) | 0 | ||||
-rw-r--r-- | arch/m68k/include/asm/mcfpci.h (renamed from arch/m68knommu/include/asm/mcfpci.h) | 0 | ||||
-rw-r--r-- | arch/m68k/include/asm/mcfpit.h (renamed from arch/m68knommu/include/asm/mcfpit.h) | 0 | ||||
-rw-r--r-- | arch/m68k/include/asm/mcfsim.h (renamed from arch/m68knommu/include/asm/mcfsim.h) | 0 | ||||
-rw-r--r-- | arch/m68k/include/asm/mcfsmc.h (renamed from arch/m68knommu/include/asm/mcfsmc.h) | 0 | ||||
-rw-r--r-- | arch/m68k/include/asm/mcftimer.h (renamed from arch/m68knommu/include/asm/mcftimer.h) | 0 | ||||
-rw-r--r-- | arch/m68k/include/asm/mcfuart.h (renamed from arch/m68knommu/include/asm/mcfuart.h) | 0 | ||||
-rw-r--r-- | arch/m68k/include/asm/mcfwdebug.h (renamed from arch/m68knommu/include/asm/mcfwdebug.h) | 0 | ||||
-rw-r--r-- | arch/m68k/include/asm/md.h (renamed from include/asm-m68k/md.h) | 0 | ||||
-rw-r--r-- | arch/m68k/include/asm/mman.h (renamed from include/asm-m68k/mman.h) | 0 | ||||
-rw-r--r-- | arch/m68k/include/asm/mmu.h | 5 | ||||
-rw-r--r-- | arch/m68k/include/asm/mmu_context.h | 5 | ||||
-rw-r--r-- | arch/m68k/include/asm/mmu_context_mm.h (renamed from include/asm-m68k/mmu_context.h) | 0 | ||||
-rw-r--r-- | arch/m68k/include/asm/mmu_context_no.h (renamed from arch/m68knommu/include/asm/mmu_context.h) | 0 | ||||
-rw-r--r-- | arch/m68k/include/asm/mmu_mm.h (renamed from include/asm-m68k/mmu.h) | 0 | ||||
-rw-r--r-- | arch/m68k/include/asm/mmu_no.h (renamed from arch/m68knommu/include/asm/mmu.h) | 0 | ||||
-rw-r--r-- | arch/m68k/include/asm/mmzone.h (renamed from include/asm-m68k/mmzone.h) | 0 | ||||
-rw-r--r-- | arch/m68k/include/asm/module.h | 5 | ||||
-rw-r--r-- | arch/m68k/include/asm/module_mm.h (renamed from include/asm-m68k/module.h) | 0 | ||||
-rw-r--r-- | arch/m68k/include/asm/module_no.h (renamed from arch/m68knommu/include/asm/module.h) | 0 | ||||
-rw-r--r-- | arch/m68k/include/asm/motorola_pgalloc.h (renamed from include/asm-m68k/motorola_pgalloc.h) | 0 | ||||
-rw-r--r-- | arch/m68k/include/asm/motorola_pgtable.h (renamed from include/asm-m68k/motorola_pgtable.h) | 0 | ||||
-rw-r--r-- | arch/m68k/include/asm/movs.h (renamed from include/asm-m68k/movs.h) | 0 | ||||
-rw-r--r-- | arch/m68k/include/asm/msgbuf.h (renamed from include/asm-m68k/msgbuf.h) | 0 | ||||
-rw-r--r-- | arch/m68k/include/asm/mutex.h (renamed from arch/m68knommu/include/asm/mutex.h) | 0 | ||||
-rw-r--r-- | arch/m68k/include/asm/mvme147hw.h (renamed from include/asm-m68k/mvme147hw.h) | 0 | ||||
-rw-r--r-- | arch/m68k/include/asm/mvme16xhw.h (renamed from include/asm-m68k/mvme16xhw.h) | 0 | ||||
-rw-r--r-- | arch/m68k/include/asm/nettel.h (renamed from arch/m68knommu/include/asm/nettel.h) | 0 | ||||
-rw-r--r-- | arch/m68k/include/asm/nubus.h (renamed from include/asm-m68k/nubus.h) | 0 | ||||
-rw-r--r-- | arch/m68k/include/asm/openprom.h (renamed from include/asm-m68k/openprom.h) | 0 | ||||
-rw-r--r-- | arch/m68k/include/asm/oplib.h (renamed from include/asm-m68k/oplib.h) | 0 | ||||
-rw-r--r-- | arch/m68k/include/asm/page.h | 5 | ||||
-rw-r--r-- | arch/m68k/include/asm/page_mm.h (renamed from include/asm-m68k/page.h) | 0 | ||||
-rw-r--r-- | arch/m68k/include/asm/page_no.h (renamed from arch/m68knommu/include/asm/page.h) | 0 | ||||
-rw-r--r-- | arch/m68k/include/asm/page_offset.h | 5 | ||||
-rw-r--r-- | arch/m68k/include/asm/page_offset_mm.h (renamed from include/asm-m68k/page_offset.h) | 0 | ||||
-rw-r--r-- | arch/m68k/include/asm/page_offset_no.h (renamed from arch/m68knommu/include/asm/page_offset.h) | 0 | ||||
-rw-r--r-- | arch/m68k/include/asm/param.h | 5 | ||||
-rw-r--r-- | arch/m68k/include/asm/param_mm.h (renamed from include/asm-m68k/param.h) | 0 | ||||
-rw-r--r-- | arch/m68k/include/asm/param_no.h (renamed from arch/m68knommu/include/asm/param.h) | 0 | ||||
-rw-r--r-- | arch/m68k/include/asm/parport.h (renamed from include/asm-m68k/parport.h) | 0 | ||||
-rw-r--r-- | arch/m68k/include/asm/pci.h | 5 | ||||
-rw-r--r-- | arch/m68k/include/asm/pci_mm.h (renamed from include/asm-m68k/pci.h) | 0 | ||||
-rw-r--r-- | arch/m68k/include/asm/pci_no.h (renamed from arch/m68knommu/include/asm/pci.h) | 2 | ||||
-rw-r--r-- | arch/m68k/include/asm/percpu.h (renamed from include/asm-m68k/percpu.h) | 0 | ||||
-rw-r--r-- | arch/m68k/include/asm/pgalloc.h | 5 | ||||
-rw-r--r-- | arch/m68k/include/asm/pgalloc_mm.h (renamed from include/asm-m68k/pgalloc.h) | 0 | ||||
-rw-r--r-- | arch/m68k/include/asm/pgalloc_no.h (renamed from arch/m68knommu/include/asm/pgalloc.h) | 0 | ||||
-rw-r--r-- | arch/m68k/include/asm/pgtable.h | 5 | ||||
-rw-r--r-- | arch/m68k/include/asm/pgtable_mm.h (renamed from include/asm-m68k/pgtable.h) | 0 | ||||
-rw-r--r-- | arch/m68k/include/asm/pgtable_no.h (renamed from arch/m68knommu/include/asm/pgtable.h) | 0 | ||||
-rw-r--r-- | arch/m68k/include/asm/poll.h (renamed from include/asm-m68k/poll.h) | 0 | ||||
-rw-r--r-- | arch/m68k/include/asm/posix_types.h (renamed from include/asm-m68k/posix_types.h) | 0 | ||||
-rw-r--r-- | arch/m68k/include/asm/processor.h | 5 | ||||
-rw-r--r-- | arch/m68k/include/asm/processor_mm.h (renamed from include/asm-m68k/processor.h) | 0 | ||||
-rw-r--r-- | arch/m68k/include/asm/processor_no.h (renamed from arch/m68knommu/include/asm/processor.h) | 0 | ||||
-rw-r--r-- | arch/m68k/include/asm/ptrace.h | 5 | ||||
-rw-r--r-- | arch/m68k/include/asm/ptrace_mm.h (renamed from include/asm-m68k/ptrace.h) | 0 | ||||
-rw-r--r-- | arch/m68k/include/asm/ptrace_no.h (renamed from arch/m68knommu/include/asm/ptrace.h) | 0 | ||||
-rw-r--r-- | arch/m68k/include/asm/q40_master.h (renamed from include/asm-m68k/q40_master.h) | 0 | ||||
-rw-r--r-- | arch/m68k/include/asm/q40ints.h (renamed from include/asm-m68k/q40ints.h) | 0 | ||||
-rw-r--r-- | arch/m68k/include/asm/quicc_simple.h (renamed from arch/m68knommu/include/asm/quicc_simple.h) | 0 | ||||
-rw-r--r-- | arch/m68k/include/asm/raw_io.h (renamed from include/asm-m68k/raw_io.h) | 0 | ||||
-rw-r--r-- | arch/m68k/include/asm/resource.h (renamed from include/asm-m68k/resource.h) | 0 | ||||
-rw-r--r-- | arch/m68k/include/asm/rtc.h (renamed from include/asm-m68k/rtc.h) | 0 | ||||
-rw-r--r-- | arch/m68k/include/asm/sbus.h (renamed from include/asm-m68k/sbus.h) | 0 | ||||
-rw-r--r-- | arch/m68k/include/asm/scatterlist.h | 5 | ||||
-rw-r--r-- | arch/m68k/include/asm/scatterlist_mm.h (renamed from include/asm-m68k/scatterlist.h) | 0 | ||||
-rw-r--r-- | arch/m68k/include/asm/scatterlist_no.h (renamed from arch/m68knommu/include/asm/scatterlist.h) | 0 | ||||
-rw-r--r-- | arch/m68k/include/asm/sections.h (renamed from include/asm-m68k/sections.h) | 0 | ||||
-rw-r--r-- | arch/m68k/include/asm/segment.h | 5 | ||||
-rw-r--r-- | arch/m68k/include/asm/segment_mm.h (renamed from include/asm-m68k/segment.h) | 0 | ||||
-rw-r--r-- | arch/m68k/include/asm/segment_no.h (renamed from arch/m68knommu/include/asm/segment.h) | 0 | ||||
-rw-r--r-- | arch/m68k/include/asm/sembuf.h (renamed from include/asm-m68k/sembuf.h) | 0 | ||||
-rw-r--r-- | arch/m68k/include/asm/serial.h (renamed from include/asm-m68k/serial.h) | 0 | ||||
-rw-r--r-- | arch/m68k/include/asm/setup.h | 5 | ||||
-rw-r--r-- | arch/m68k/include/asm/setup_mm.h (renamed from include/asm-m68k/setup.h) | 0 | ||||
-rw-r--r-- | arch/m68k/include/asm/setup_no.h (renamed from arch/m68knommu/include/asm/setup.h) | 2 | ||||
-rw-r--r-- | arch/m68k/include/asm/shm.h (renamed from include/asm-m68k/shm.h) | 0 | ||||
-rw-r--r-- | arch/m68k/include/asm/shmbuf.h (renamed from include/asm-m68k/shmbuf.h) | 0 | ||||
-rw-r--r-- | arch/m68k/include/asm/shmparam.h (renamed from include/asm-m68k/shmparam.h) | 0 | ||||
-rw-r--r-- | arch/m68k/include/asm/sigcontext.h | 5 | ||||
-rw-r--r-- | arch/m68k/include/asm/sigcontext_mm.h (renamed from include/asm-m68k/sigcontext.h) | 0 | ||||
-rw-r--r-- | arch/m68k/include/asm/sigcontext_no.h (renamed from arch/m68knommu/include/asm/sigcontext.h) | 0 | ||||
-rw-r--r-- | arch/m68k/include/asm/siginfo.h | 5 | ||||
-rw-r--r-- | arch/m68k/include/asm/siginfo_mm.h (renamed from include/asm-m68k/siginfo.h) | 0 | ||||
-rw-r--r-- | arch/m68k/include/asm/siginfo_no.h (renamed from arch/m68knommu/include/asm/siginfo.h) | 0 | ||||
-rw-r--r-- | arch/m68k/include/asm/signal.h | 5 | ||||
-rw-r--r-- | arch/m68k/include/asm/signal_mm.h (renamed from include/asm-m68k/signal.h) | 0 | ||||
-rw-r--r-- | arch/m68k/include/asm/signal_no.h (renamed from arch/m68knommu/include/asm/signal.h) | 0 | ||||
-rw-r--r-- | arch/m68k/include/asm/smp.h (renamed from arch/m68knommu/include/asm/smp.h) | 0 | ||||
-rw-r--r-- | arch/m68k/include/asm/socket.h (renamed from include/asm-m68k/socket.h) | 0 | ||||
-rw-r--r-- | arch/m68k/include/asm/sockios.h (renamed from include/asm-m68k/sockios.h) | 0 | ||||
-rw-r--r-- | arch/m68k/include/asm/spinlock.h (renamed from include/asm-m68k/spinlock.h) | 0 | ||||
-rw-r--r-- | arch/m68k/include/asm/stat.h (renamed from include/asm-m68k/stat.h) | 0 | ||||
-rw-r--r-- | arch/m68k/include/asm/statfs.h (renamed from include/asm-m68k/statfs.h) | 0 | ||||
-rw-r--r-- | arch/m68k/include/asm/string.h | 5 | ||||
-rw-r--r-- | arch/m68k/include/asm/string_mm.h (renamed from include/asm-m68k/string.h) | 0 | ||||
-rw-r--r-- | arch/m68k/include/asm/string_no.h (renamed from arch/m68knommu/include/asm/string.h) | 0 | ||||
-rw-r--r-- | arch/m68k/include/asm/sun3-head.h (renamed from include/asm-m68k/sun3-head.h) | 0 | ||||
-rw-r--r-- | arch/m68k/include/asm/sun3_pgalloc.h (renamed from include/asm-m68k/sun3_pgalloc.h) | 0 | ||||
-rw-r--r-- | arch/m68k/include/asm/sun3_pgtable.h (renamed from include/asm-m68k/sun3_pgtable.h) | 0 | ||||
-rw-r--r-- | arch/m68k/include/asm/sun3ints.h (renamed from include/asm-m68k/sun3ints.h) | 0 | ||||
-rw-r--r-- | arch/m68k/include/asm/sun3mmu.h (renamed from include/asm-m68k/sun3mmu.h) | 0 | ||||
-rw-r--r-- | arch/m68k/include/asm/sun3x.h (renamed from include/asm-m68k/sun3x.h) | 0 | ||||
-rw-r--r-- | arch/m68k/include/asm/sun3xflop.h (renamed from include/asm-m68k/sun3xflop.h) | 0 | ||||
-rw-r--r-- | arch/m68k/include/asm/sun3xprom.h (renamed from include/asm-m68k/sun3xprom.h) | 0 | ||||
-rw-r--r-- | arch/m68k/include/asm/suspend.h (renamed from include/asm-m68k/suspend.h) | 0 | ||||
-rw-r--r-- | arch/m68k/include/asm/swab.h | 0 | ||||
-rw-r--r-- | arch/m68k/include/asm/swab_mm.h (renamed from include/asm-m68k/swab.h) | 0 | ||||
-rw-r--r-- | arch/m68k/include/asm/swab_no.h (renamed from arch/m68knommu/include/asm/swab.h) | 0 | ||||
-rw-r--r-- | arch/m68k/include/asm/system.h | 5 | ||||
-rw-r--r-- | arch/m68k/include/asm/system_mm.h (renamed from include/asm-m68k/system.h) | 0 | ||||
-rw-r--r-- | arch/m68k/include/asm/system_no.h (renamed from arch/m68knommu/include/asm/system.h) | 0 | ||||
-rw-r--r-- | arch/m68k/include/asm/termbits.h (renamed from include/asm-m68k/termbits.h) | 0 | ||||
-rw-r--r-- | arch/m68k/include/asm/termios.h (renamed from include/asm-m68k/termios.h) | 0 | ||||
-rw-r--r-- | arch/m68k/include/asm/thread_info.h | 5 | ||||
-rw-r--r-- | arch/m68k/include/asm/thread_info_mm.h (renamed from include/asm-m68k/thread_info.h) | 0 | ||||
-rw-r--r-- | arch/m68k/include/asm/thread_info_no.h (renamed from arch/m68knommu/include/asm/thread_info.h) | 0 | ||||
-rw-r--r-- | arch/m68k/include/asm/timex.h | 5 | ||||
-rw-r--r-- | arch/m68k/include/asm/timex_mm.h (renamed from include/asm-m68k/timex.h) | 0 | ||||
-rw-r--r-- | arch/m68k/include/asm/timex_no.h (renamed from arch/m68knommu/include/asm/timex.h) | 0 | ||||
-rw-r--r-- | arch/m68k/include/asm/tlb.h (renamed from include/asm-m68k/tlb.h) | 0 | ||||
-rw-r--r-- | arch/m68k/include/asm/tlbflush.h | 5 | ||||
-rw-r--r-- | arch/m68k/include/asm/tlbflush_mm.h (renamed from include/asm-m68k/tlbflush.h) | 0 | ||||
-rw-r--r-- | arch/m68k/include/asm/tlbflush_no.h (renamed from arch/m68knommu/include/asm/tlbflush.h) | 0 | ||||
-rw-r--r-- | arch/m68k/include/asm/topology.h (renamed from arch/m68knommu/include/asm/topology.h) | 0 | ||||
-rw-r--r-- | arch/m68k/include/asm/traps.h | 5 | ||||
-rw-r--r-- | arch/m68k/include/asm/traps_mm.h (renamed from include/asm-m68k/traps.h) | 0 | ||||
-rw-r--r-- | arch/m68k/include/asm/traps_no.h (renamed from arch/m68knommu/include/asm/traps.h) | 0 | ||||
-rw-r--r-- | arch/m68k/include/asm/types.h (renamed from include/asm-m68k/types.h) | 0 | ||||
-rw-r--r-- | arch/m68k/include/asm/uaccess.h | 5 | ||||
-rw-r--r-- | arch/m68k/include/asm/uaccess_mm.h (renamed from include/asm-m68k/uaccess.h) | 0 | ||||
-rw-r--r-- | arch/m68k/include/asm/uaccess_no.h (renamed from arch/m68knommu/include/asm/uaccess.h) | 0 | ||||
-rw-r--r-- | arch/m68k/include/asm/ucontext.h | 5 | ||||
-rw-r--r-- | arch/m68k/include/asm/ucontext_mm.h (renamed from include/asm-m68k/ucontext.h) | 0 | ||||
-rw-r--r-- | arch/m68k/include/asm/ucontext_no.h (renamed from arch/m68knommu/include/asm/ucontext.h) | 0 | ||||
-rw-r--r-- | arch/m68k/include/asm/unaligned.h | 5 | ||||
-rw-r--r-- | arch/m68k/include/asm/unaligned_mm.h (renamed from include/asm-m68k/unaligned.h) | 0 | ||||
-rw-r--r-- | arch/m68k/include/asm/unaligned_no.h (renamed from arch/m68knommu/include/asm/unaligned.h) | 0 | ||||
-rw-r--r-- | arch/m68k/include/asm/unistd.h | 5 | ||||
-rw-r--r-- | arch/m68k/include/asm/unistd_mm.h (renamed from include/asm-m68k/unistd.h) | 0 | ||||
-rw-r--r-- | arch/m68k/include/asm/unistd_no.h (renamed from arch/m68knommu/include/asm/unistd.h) | 0 | ||||
-rw-r--r-- | arch/m68k/include/asm/user.h (renamed from include/asm-m68k/user.h) | 0 | ||||
-rw-r--r-- | arch/m68k/include/asm/virtconvert.h (renamed from include/asm-m68k/virtconvert.h) | 0 | ||||
-rw-r--r-- | arch/m68k/include/asm/xor.h (renamed from include/asm-m68k/xor.h) | 0 | ||||
-rw-r--r-- | arch/m68k/include/asm/zorro.h (renamed from include/asm-m68k/zorro.h) | 0 | ||||
-rw-r--r-- | arch/m68knommu/include/asm/Kbuild | 3 | ||||
-rw-r--r-- | arch/m68knommu/include/asm/cachectl.h | 1 | ||||
-rw-r--r-- | arch/m68knommu/include/asm/cputime.h | 6 | ||||
-rw-r--r-- | arch/m68knommu/include/asm/errno.h | 1 | ||||
-rw-r--r-- | arch/m68knommu/include/asm/fcntl.h | 1 | ||||
-rw-r--r-- | arch/m68knommu/include/asm/hwtest.h | 1 | ||||
-rw-r--r-- | arch/m68knommu/include/asm/ioctls.h | 1 | ||||
-rw-r--r-- | arch/m68knommu/include/asm/ipcbuf.h | 1 | ||||
-rw-r--r-- | arch/m68knommu/include/asm/linkage.h | 1 | ||||
-rw-r--r-- | arch/m68knommu/include/asm/local.h | 6 | ||||
-rw-r--r-- | arch/m68knommu/include/asm/math-emu.h | 1 | ||||
-rw-r--r-- | arch/m68knommu/include/asm/md.h | 1 | ||||
-rw-r--r-- | arch/m68knommu/include/asm/mman.h | 1 | ||||
-rw-r--r-- | arch/m68knommu/include/asm/movs.h | 1 | ||||
-rw-r--r-- | arch/m68knommu/include/asm/msgbuf.h | 1 | ||||
-rw-r--r-- | arch/m68knommu/include/asm/openprom.h | 1 | ||||
-rw-r--r-- | arch/m68knommu/include/asm/oplib.h | 1 | ||||
-rw-r--r-- | arch/m68knommu/include/asm/percpu.h | 6 | ||||
-rw-r--r-- | arch/m68knommu/include/asm/poll.h | 1 | ||||
-rw-r--r-- | arch/m68knommu/include/asm/posix_types.h | 1 | ||||
-rw-r--r-- | arch/m68knommu/include/asm/resource.h | 1 | ||||
-rw-r--r-- | arch/m68knommu/include/asm/rtc.h | 1 | ||||
-rw-r--r-- | arch/m68knommu/include/asm/sections.h | 7 | ||||
-rw-r--r-- | arch/m68knommu/include/asm/sembuf.h | 1 | ||||
-rw-r--r-- | arch/m68knommu/include/asm/shm.h | 1 | ||||
-rw-r--r-- | arch/m68knommu/include/asm/shmbuf.h | 1 | ||||
-rw-r--r-- | arch/m68knommu/include/asm/shmparam.h | 1 | ||||
-rw-r--r-- | arch/m68knommu/include/asm/socket.h | 1 | ||||
-rw-r--r-- | arch/m68knommu/include/asm/sockios.h | 1 | ||||
-rw-r--r-- | arch/m68knommu/include/asm/spinlock.h | 1 | ||||
-rw-r--r-- | arch/m68knommu/include/asm/stat.h | 1 | ||||
-rw-r--r-- | arch/m68knommu/include/asm/statfs.h | 1 | ||||
-rw-r--r-- | arch/m68knommu/include/asm/termbits.h | 1 | ||||
-rw-r--r-- | arch/m68knommu/include/asm/termios.h | 1 | ||||
-rw-r--r-- | arch/m68knommu/include/asm/tlb.h | 1 | ||||
-rw-r--r-- | arch/m68knommu/include/asm/types.h | 1 | ||||
-rw-r--r-- | arch/m68knommu/include/asm/user.h | 1 | ||||
-rw-r--r-- | include/asm-m68k/auxvec.h | 4 | ||||
-rw-r--r-- | include/asm-m68k/device.h | 7 | ||||
-rw-r--r-- | include/asm-m68k/emergency-restart.h | 6 | ||||
-rw-r--r-- | include/asm-m68k/futex.h | 6 | ||||
-rw-r--r-- | include/asm-m68k/ioctl.h | 1 | ||||
-rw-r--r-- | include/asm-m68k/irq_regs.h | 1 | ||||
-rw-r--r-- | include/asm-m68k/kdebug.h | 1 | ||||
-rw-r--r-- | include/asm-m68k/mutex.h | 9 | ||||
-rw-r--r-- | include/asm-m68k/topology.h | 6 |
355 files changed, 266 insertions, 103 deletions
@@ -213,6 +213,10 @@ endif | |||
213 | # Where to locate arch specific headers | 213 | # Where to locate arch specific headers |
214 | hdr-arch := $(SRCARCH) | 214 | hdr-arch := $(SRCARCH) |
215 | 215 | ||
216 | ifeq ($(ARCH),m68knommu) | ||
217 | hdr-arch := m68k | ||
218 | endif | ||
219 | |||
216 | KCONFIG_CONFIG ?= .config | 220 | KCONFIG_CONFIG ?= .config |
217 | 221 | ||
218 | # SHELL used by kbuild | 222 | # SHELL used by kbuild |
diff --git a/include/asm-m68k/Kbuild b/arch/m68k/include/asm/Kbuild index 52fd96b4142..52fd96b4142 100644 --- a/include/asm-m68k/Kbuild +++ b/arch/m68k/include/asm/Kbuild | |||
diff --git a/arch/m68knommu/include/asm/MC68328.h b/arch/m68k/include/asm/MC68328.h index a337e56d09b..a337e56d09b 100644 --- a/arch/m68knommu/include/asm/MC68328.h +++ b/arch/m68k/include/asm/MC68328.h | |||
diff --git a/arch/m68knommu/include/asm/MC68332.h b/arch/m68k/include/asm/MC68332.h index 6bb8f02685a..6bb8f02685a 100644 --- a/arch/m68knommu/include/asm/MC68332.h +++ b/arch/m68k/include/asm/MC68332.h | |||
diff --git a/arch/m68knommu/include/asm/MC68EZ328.h b/arch/m68k/include/asm/MC68EZ328.h index 69b7f9139e5..69b7f9139e5 100644 --- a/arch/m68knommu/include/asm/MC68EZ328.h +++ b/arch/m68k/include/asm/MC68EZ328.h | |||
diff --git a/arch/m68knommu/include/asm/MC68VZ328.h b/arch/m68k/include/asm/MC68VZ328.h index 2b9bf626a0a..2b9bf626a0a 100644 --- a/arch/m68knommu/include/asm/MC68VZ328.h +++ b/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 index f6bfc1d63ff..f6bfc1d63ff 100644 --- a/include/asm-m68k/a.out-core.h +++ b/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 index 3885fe43432..3885fe43432 100644 --- a/include/asm-m68k/a.out.h +++ b/arch/m68k/include/asm/a.out.h | |||
diff --git a/include/asm-m68k/adb_iop.h b/arch/m68k/include/asm/adb_iop.h index 8a48e56f2d6..8a48e56f2d6 100644 --- a/include/asm-m68k/adb_iop.h +++ b/arch/m68k/include/asm/adb_iop.h | |||
diff --git a/include/asm-m68k/amigahw.h b/arch/m68k/include/asm/amigahw.h index 5ca5dd951a4..5ca5dd951a4 100644 --- a/include/asm-m68k/amigahw.h +++ b/arch/m68k/include/asm/amigahw.h | |||
diff --git a/include/asm-m68k/amigaints.h b/arch/m68k/include/asm/amigaints.h index b1bcdb835ab..b1bcdb835ab 100644 --- a/include/asm-m68k/amigaints.h +++ b/arch/m68k/include/asm/amigaints.h | |||
diff --git a/include/asm-m68k/amigayle.h b/arch/m68k/include/asm/amigayle.h index bb5a6aa329f..bb5a6aa329f 100644 --- a/include/asm-m68k/amigayle.h +++ b/arch/m68k/include/asm/amigayle.h | |||
diff --git a/include/asm-m68k/amipcmcia.h b/arch/m68k/include/asm/amipcmcia.h index 6f1ec1887d8..6f1ec1887d8 100644 --- a/include/asm-m68k/amipcmcia.h +++ b/arch/m68k/include/asm/amipcmcia.h | |||
diff --git a/arch/m68knommu/include/asm/anchor.h b/arch/m68k/include/asm/anchor.h index 871c0d5cfc3..871c0d5cfc3 100644 --- a/arch/m68knommu/include/asm/anchor.h +++ b/arch/m68k/include/asm/anchor.h | |||
diff --git a/include/asm-m68k/apollodma.h b/arch/m68k/include/asm/apollodma.h index 954adc851ad..954adc851ad 100644 --- a/include/asm-m68k/apollodma.h +++ b/arch/m68k/include/asm/apollodma.h | |||
diff --git a/include/asm-m68k/apollohw.h b/arch/m68k/include/asm/apollohw.h index a1373b9aa28..a1373b9aa28 100644 --- a/include/asm-m68k/apollohw.h +++ b/arch/m68k/include/asm/apollohw.h | |||
diff --git a/include/asm-m68k/atafd.h b/arch/m68k/include/asm/atafd.h index 8456889ee7d..8456889ee7d 100644 --- a/include/asm-m68k/atafd.h +++ b/arch/m68k/include/asm/atafd.h | |||
diff --git a/include/asm-m68k/atafdreg.h b/arch/m68k/include/asm/atafdreg.h index bbf80949fd9..bbf80949fd9 100644 --- a/include/asm-m68k/atafdreg.h +++ b/arch/m68k/include/asm/atafdreg.h | |||
diff --git a/include/asm-m68k/atari_joystick.h b/arch/m68k/include/asm/atari_joystick.h index 93be7da9f2c..93be7da9f2c 100644 --- a/include/asm-m68k/atari_joystick.h +++ b/arch/m68k/include/asm/atari_joystick.h | |||
diff --git a/include/asm-m68k/atari_stdma.h b/arch/m68k/include/asm/atari_stdma.h index 8e389b7fa70..8e389b7fa70 100644 --- a/include/asm-m68k/atari_stdma.h +++ b/arch/m68k/include/asm/atari_stdma.h | |||
diff --git a/include/asm-m68k/atari_stram.h b/arch/m68k/include/asm/atari_stram.h index 7546d13963b..7546d13963b 100644 --- a/include/asm-m68k/atari_stram.h +++ b/arch/m68k/include/asm/atari_stram.h | |||
diff --git a/include/asm-m68k/atarihw.h b/arch/m68k/include/asm/atarihw.h index 1412b4ab202..1412b4ab202 100644 --- a/include/asm-m68k/atarihw.h +++ b/arch/m68k/include/asm/atarihw.h | |||
diff --git a/include/asm-m68k/atariints.h b/arch/m68k/include/asm/atariints.h index 5748e99f4e2..5748e99f4e2 100644 --- a/include/asm-m68k/atariints.h +++ b/arch/m68k/include/asm/atariints.h | |||
diff --git a/include/asm-m68k/atarikb.h b/arch/m68k/include/asm/atarikb.h index 546e7da5804..546e7da5804 100644 --- a/include/asm-m68k/atarikb.h +++ b/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 00000000000..8d29145ebb2 --- /dev/null +++ b/arch/m68k/include/asm/atomic.h | |||
@@ -0,0 +1,5 @@ | |||
1 | #ifdef __uClinux__ | ||
2 | #include "atomic_no.h" | ||
3 | #else | ||
4 | #include "atomic_mm.h" | ||
5 | #endif | ||
diff --git a/include/asm-m68k/atomic.h b/arch/m68k/include/asm/atomic_mm.h index eb0ab9d4ee7..eb0ab9d4ee7 100644 --- a/include/asm-m68k/atomic.h +++ b/arch/m68k/include/asm/atomic_mm.h | |||
diff --git a/arch/m68knommu/include/asm/atomic.h b/arch/m68k/include/asm/atomic_no.h index 6bb674855a3..6bb674855a3 100644 --- a/arch/m68knommu/include/asm/atomic.h +++ b/arch/m68k/include/asm/atomic_no.h | |||
diff --git a/arch/m68knommu/include/asm/auxvec.h b/arch/m68k/include/asm/auxvec.h index 844d6d52204..844d6d52204 100644 --- a/arch/m68knommu/include/asm/auxvec.h +++ b/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 00000000000..ce163abddab --- /dev/null +++ b/arch/m68k/include/asm/bitops.h | |||
@@ -0,0 +1,5 @@ | |||
1 | #ifdef __uClinux__ | ||
2 | #include "bitops_no.h" | ||
3 | #else | ||
4 | #include "bitops_mm.h" | ||
5 | #endif | ||
diff --git a/include/asm-m68k/bitops.h b/arch/m68k/include/asm/bitops_mm.h index 9bde784e7ba..9bde784e7ba 100644 --- a/include/asm-m68k/bitops.h +++ b/arch/m68k/include/asm/bitops_mm.h | |||
diff --git a/arch/m68knommu/include/asm/bitops.h b/arch/m68k/include/asm/bitops_no.h index 9d3cbe5fad1..9d3cbe5fad1 100644 --- a/arch/m68knommu/include/asm/bitops.h +++ b/arch/m68k/include/asm/bitops_no.h | |||
diff --git a/include/asm-m68k/blinken.h b/arch/m68k/include/asm/blinken.h index 1a749cf7b06..1a749cf7b06 100644 --- a/include/asm-m68k/blinken.h +++ b/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 00000000000..fedf3e32612 --- /dev/null +++ b/arch/m68k/include/asm/bootinfo.h | |||
@@ -0,0 +1,5 @@ | |||
1 | #ifdef __uClinux__ | ||
2 | #include "bootinfo_no.h" | ||
3 | #else | ||
4 | #include "bootinfo_mm.h" | ||
5 | #endif | ||
diff --git a/include/asm-m68k/bootinfo.h b/arch/m68k/include/asm/bootinfo_mm.h index fb8a06b9ab6..fb8a06b9ab6 100644 --- a/include/asm-m68k/bootinfo.h +++ b/arch/m68k/include/asm/bootinfo_mm.h | |||
diff --git a/arch/m68knommu/include/asm/bootinfo.h b/arch/m68k/include/asm/bootinfo_no.h index c12e526f518..c12e526f518 100644 --- a/arch/m68knommu/include/asm/bootinfo.h +++ b/arch/m68k/include/asm/bootinfo_no.h | |||
diff --git a/arch/m68knommu/include/asm/bootstd.h b/arch/m68k/include/asm/bootstd.h index bdc1a4ac4fe..bdc1a4ac4fe 100644 --- a/arch/m68knommu/include/asm/bootstd.h +++ b/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 00000000000..997e0944ebc --- /dev/null +++ b/arch/m68k/include/asm/bug.h | |||
@@ -0,0 +1,5 @@ | |||
1 | #ifdef __uClinux__ | ||
2 | #include "bug_no.h" | ||
3 | #else | ||
4 | #include "bug_mm.h" | ||
5 | #endif | ||
diff --git a/include/asm-m68k/bug.h b/arch/m68k/include/asm/bug_mm.h index e5b528deb8a..e5b528deb8a 100644 --- a/include/asm-m68k/bug.h +++ b/arch/m68k/include/asm/bug_mm.h | |||
diff --git a/arch/m68knommu/include/asm/bug.h b/arch/m68k/include/asm/bug_no.h index 70e7dc0af21..70e7dc0af21 100644 --- a/arch/m68knommu/include/asm/bug.h +++ b/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 00000000000..01f047d784e --- /dev/null +++ b/arch/m68k/include/asm/bugs.h | |||
@@ -0,0 +1,5 @@ | |||
1 | #ifdef __uClinux__ | ||
2 | #include "bugs_no.h" | ||
3 | #else | ||
4 | #include "bugs_mm.h" | ||
5 | #endif | ||
diff --git a/include/asm-m68k/bugs.h b/arch/m68k/include/asm/bugs_mm.h index d0193559241..d0193559241 100644 --- a/include/asm-m68k/bugs.h +++ b/arch/m68k/include/asm/bugs_mm.h | |||
diff --git a/arch/m68knommu/include/asm/bugs.h b/arch/m68k/include/asm/bugs_no.h index 5f382dac3a6..5f382dac3a6 100644 --- a/arch/m68knommu/include/asm/bugs.h +++ b/arch/m68k/include/asm/bugs_no.h | |||
diff --git a/include/asm-m68k/bvme6000hw.h b/arch/m68k/include/asm/bvme6000hw.h index f40d2f8510e..f40d2f8510e 100644 --- a/include/asm-m68k/bvme6000hw.h +++ b/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 00000000000..f20502a001f --- /dev/null +++ b/arch/m68k/include/asm/byteorder.h | |||
@@ -0,0 +1,5 @@ | |||
1 | #ifdef __uClinux__ | ||
2 | #include "byteorder_no.h" | ||
3 | #else | ||
4 | #include "byteorder_mm.h" | ||
5 | #endif | ||
diff --git a/include/asm-m68k/byteorder.h b/arch/m68k/include/asm/byteorder_mm.h index 300866523b8..300866523b8 100644 --- a/include/asm-m68k/byteorder.h +++ b/arch/m68k/include/asm/byteorder_mm.h | |||
diff --git a/arch/m68knommu/include/asm/byteorder.h b/arch/m68k/include/asm/byteorder_no.h index a6f0b8f7f62..a6f0b8f7f62 100644 --- a/arch/m68knommu/include/asm/byteorder.h +++ b/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 00000000000..599c29bc8f4 --- /dev/null +++ b/arch/m68k/include/asm/cache.h | |||
@@ -0,0 +1,5 @@ | |||
1 | #ifdef __uClinux__ | ||
2 | #include "cache_no.h" | ||
3 | #else | ||
4 | #include "cache_mm.h" | ||
5 | #endif | ||
diff --git a/include/asm-m68k/cache.h b/arch/m68k/include/asm/cache_mm.h index fed3fd30de7..fed3fd30de7 100644 --- a/include/asm-m68k/cache.h +++ b/arch/m68k/include/asm/cache_mm.h | |||
diff --git a/arch/m68knommu/include/asm/cache.h b/arch/m68k/include/asm/cache_no.h index 24e9eace5f8..24e9eace5f8 100644 --- a/arch/m68knommu/include/asm/cache.h +++ b/arch/m68k/include/asm/cache_no.h | |||
diff --git a/include/asm-m68k/cachectl.h b/arch/m68k/include/asm/cachectl.h index 525978e959e..525978e959e 100644 --- a/include/asm-m68k/cachectl.h +++ b/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 00000000000..a70d7319630 --- /dev/null +++ b/arch/m68k/include/asm/cacheflush.h | |||
@@ -0,0 +1,5 @@ | |||
1 | #ifdef __uClinux__ | ||
2 | #include "cacheflush_no.h" | ||
3 | #else | ||
4 | #include "cacheflush_mm.h" | ||
5 | #endif | ||
diff --git a/include/asm-m68k/cacheflush.h b/arch/m68k/include/asm/cacheflush_mm.h index 16bf375fdbe..16bf375fdbe 100644 --- a/include/asm-m68k/cacheflush.h +++ b/arch/m68k/include/asm/cacheflush_mm.h | |||
diff --git a/arch/m68knommu/include/asm/cacheflush.h b/arch/m68k/include/asm/cacheflush_no.h index 87e5dc0413b..87e5dc0413b 100644 --- a/arch/m68knommu/include/asm/cacheflush.h +++ b/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 00000000000..1cf54476745 --- /dev/null +++ b/arch/m68k/include/asm/checksum.h | |||
@@ -0,0 +1,5 @@ | |||
1 | #ifdef __uClinux__ | ||
2 | #include "checksum_no.h" | ||
3 | #else | ||
4 | #include "checksum_mm.h" | ||
5 | #endif | ||
diff --git a/include/asm-m68k/checksum.h b/arch/m68k/include/asm/checksum_mm.h index 494f9aec37e..494f9aec37e 100644 --- a/include/asm-m68k/checksum.h +++ b/arch/m68k/include/asm/checksum_mm.h | |||
diff --git a/arch/m68knommu/include/asm/checksum.h b/arch/m68k/include/asm/checksum_no.h index 81883482ffb..81883482ffb 100644 --- a/arch/m68knommu/include/asm/checksum.h +++ b/arch/m68k/include/asm/checksum_no.h | |||
diff --git a/arch/m68knommu/include/asm/coldfire.h b/arch/m68k/include/asm/coldfire.h index 83a9fa4e618..83a9fa4e618 100644 --- a/arch/m68knommu/include/asm/coldfire.h +++ b/arch/m68k/include/asm/coldfire.h | |||
diff --git a/arch/m68knommu/include/asm/commproc.h b/arch/m68k/include/asm/commproc.h index edf5eb6c08d..edf5eb6c08d 100644 --- a/arch/m68knommu/include/asm/commproc.h +++ b/arch/m68k/include/asm/commproc.h | |||
diff --git a/include/asm-m68k/contregs.h b/arch/m68k/include/asm/contregs.h index d1ea750bddf..d1ea750bddf 100644 --- a/include/asm-m68k/contregs.h +++ b/arch/m68k/include/asm/contregs.h | |||
diff --git a/include/asm-m68k/cputime.h b/arch/m68k/include/asm/cputime.h index c79c5e89230..c79c5e89230 100644 --- a/include/asm-m68k/cputime.h +++ b/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 00000000000..51b056dfaed --- /dev/null +++ b/arch/m68k/include/asm/current.h | |||
@@ -0,0 +1,5 @@ | |||
1 | #ifdef __uClinux__ | ||
2 | #include "current_no.h" | ||
3 | #else | ||
4 | #include "current_mm.h" | ||
5 | #endif | ||
diff --git a/include/asm-m68k/current.h b/arch/m68k/include/asm/current_mm.h index 8de8f8ceda6..8de8f8ceda6 100644 --- a/include/asm-m68k/current.h +++ b/arch/m68k/include/asm/current_mm.h | |||
diff --git a/arch/m68knommu/include/asm/current.h b/arch/m68k/include/asm/current_no.h index 53ee0f9f7ce..53ee0f9f7ce 100644 --- a/arch/m68knommu/include/asm/current.h +++ b/arch/m68k/include/asm/current_no.h | |||
diff --git a/arch/m68knommu/include/asm/dbg.h b/arch/m68k/include/asm/dbg.h index 27af3270f67..27af3270f67 100644 --- a/arch/m68knommu/include/asm/dbg.h +++ b/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 00000000000..d2598e3dd7b --- /dev/null +++ b/arch/m68k/include/asm/delay.h | |||
@@ -0,0 +1,5 @@ | |||
1 | #ifdef __uClinux__ | ||
2 | #include "delay_no.h" | ||
3 | #else | ||
4 | #include "delay_mm.h" | ||
5 | #endif | ||
diff --git a/include/asm-m68k/delay.h b/arch/m68k/include/asm/delay_mm.h index 5ed92851bc6..5ed92851bc6 100644 --- a/include/asm-m68k/delay.h +++ b/arch/m68k/include/asm/delay_mm.h | |||
diff --git a/arch/m68knommu/include/asm/delay.h b/arch/m68k/include/asm/delay_no.h index 55cbd6294ab..55cbd6294ab 100644 --- a/arch/m68knommu/include/asm/delay.h +++ b/arch/m68k/include/asm/delay_no.h | |||
diff --git a/arch/m68knommu/include/asm/device.h b/arch/m68k/include/asm/device.h index d8f9872b0e2..d8f9872b0e2 100644 --- a/arch/m68knommu/include/asm/device.h +++ b/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 00000000000..d211d9f5427 --- /dev/null +++ b/arch/m68k/include/asm/div64.h | |||
@@ -0,0 +1,5 @@ | |||
1 | #ifdef __uClinux__ | ||
2 | #include "div64_no.h" | ||
3 | #else | ||
4 | #include "div64_mm.h" | ||
5 | #endif | ||
diff --git a/include/asm-m68k/div64.h b/arch/m68k/include/asm/div64_mm.h index 8243c931b5c..8243c931b5c 100644 --- a/include/asm-m68k/div64.h +++ b/arch/m68k/include/asm/div64_mm.h | |||
diff --git a/arch/m68knommu/include/asm/div64.h b/arch/m68k/include/asm/div64_no.h index 6cd978cefb2..6cd978cefb2 100644 --- a/arch/m68knommu/include/asm/div64.h +++ b/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 00000000000..f4a4c7638f8 --- /dev/null +++ b/arch/m68k/include/asm/dma-mapping.h | |||
@@ -0,0 +1,5 @@ | |||
1 | #ifdef __uClinux__ | ||
2 | #include "dma-mapping_no.h" | ||
3 | #else | ||
4 | #include "dma-mapping_mm.h" | ||
5 | #endif | ||
diff --git a/include/asm-m68k/dma-mapping.h b/arch/m68k/include/asm/dma-mapping_mm.h index 26f505488c1..26f505488c1 100644 --- a/include/asm-m68k/dma-mapping.h +++ b/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 index 6aeab18e58b..6aeab18e58b 100644 --- a/arch/m68knommu/include/asm/dma-mapping.h +++ b/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 00000000000..b82e660cf1c --- /dev/null +++ b/arch/m68k/include/asm/dma.h | |||
@@ -0,0 +1,5 @@ | |||
1 | #ifdef __uClinux__ | ||
2 | #include "dma_no.h" | ||
3 | #else | ||
4 | #include "dma_mm.h" | ||
5 | #endif | ||
diff --git a/include/asm-m68k/dma.h b/arch/m68k/include/asm/dma_mm.h index 4240fbc946f..4240fbc946f 100644 --- a/include/asm-m68k/dma.h +++ b/arch/m68k/include/asm/dma_mm.h | |||
diff --git a/arch/m68knommu/include/asm/dma.h b/arch/m68k/include/asm/dma_no.h index 939a0205621..939a0205621 100644 --- a/arch/m68knommu/include/asm/dma.h +++ b/arch/m68k/include/asm/dma_no.h | |||
diff --git a/include/asm-m68k/dsp56k.h b/arch/m68k/include/asm/dsp56k.h index 2d8c0c9f794..2d8c0c9f794 100644 --- a/include/asm-m68k/dsp56k.h +++ b/arch/m68k/include/asm/dsp56k.h | |||
diff --git a/include/asm-m68k/dvma.h b/arch/m68k/include/asm/dvma.h index 890bbf7e775..890bbf7e775 100644 --- a/include/asm-m68k/dvma.h +++ b/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 00000000000..04ce488bc63 --- /dev/null +++ b/arch/m68k/include/asm/elf.h | |||
@@ -0,0 +1,5 @@ | |||
1 | #ifdef __uClinux__ | ||
2 | #include "elf_no.h" | ||
3 | #else | ||
4 | #include "elf_mm.h" | ||
5 | #endif | ||
diff --git a/include/asm-m68k/elf.h b/arch/m68k/include/asm/elf_mm.h index 0b0f49eb876..0b0f49eb876 100644 --- a/include/asm-m68k/elf.h +++ b/arch/m68k/include/asm/elf_mm.h | |||
diff --git a/arch/m68knommu/include/asm/elf.h b/arch/m68k/include/asm/elf_no.h index b8046837f38..b8046837f38 100644 --- a/arch/m68knommu/include/asm/elf.h +++ b/arch/m68k/include/asm/elf_no.h | |||
diff --git a/arch/m68knommu/include/asm/elia.h b/arch/m68k/include/asm/elia.h index e037d4e2de3..e037d4e2de3 100644 --- a/arch/m68knommu/include/asm/elia.h +++ b/arch/m68k/include/asm/elia.h | |||
diff --git a/arch/m68knommu/include/asm/emergency-restart.h b/arch/m68k/include/asm/emergency-restart.h index 108d8c48e42..108d8c48e42 100644 --- a/arch/m68knommu/include/asm/emergency-restart.h +++ b/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 00000000000..876eec6f2b5 --- /dev/null +++ b/arch/m68k/include/asm/entry.h | |||
@@ -0,0 +1,5 @@ | |||
1 | #ifdef __uClinux__ | ||
2 | #include "entry_no.h" | ||
3 | #else | ||
4 | #include "entry_mm.h" | ||
5 | #endif | ||
diff --git a/include/asm-m68k/entry.h b/arch/m68k/include/asm/entry_mm.h index 5202f5a5b42..5202f5a5b42 100644 --- a/include/asm-m68k/entry.h +++ b/arch/m68k/include/asm/entry_mm.h | |||
diff --git a/arch/m68knommu/include/asm/entry.h b/arch/m68k/include/asm/entry_no.h index c2553d26273..c2553d26273 100644 --- a/arch/m68knommu/include/asm/entry.h +++ b/arch/m68k/include/asm/entry_no.h | |||
diff --git a/include/asm-m68k/errno.h b/arch/m68k/include/asm/errno.h index 0d4e188d6ef..0d4e188d6ef 100644 --- a/include/asm-m68k/errno.h +++ b/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 00000000000..97bcaefd206 --- /dev/null +++ b/arch/m68k/include/asm/fb.h | |||
@@ -0,0 +1,5 @@ | |||
1 | #ifdef __uClinux__ | ||
2 | #include "fb_no.h" | ||
3 | #else | ||
4 | #include "fb_mm.h" | ||
5 | #endif | ||
diff --git a/include/asm-m68k/fb.h b/arch/m68k/include/asm/fb_mm.h index 380b97ae815..380b97ae815 100644 --- a/include/asm-m68k/fb.h +++ b/arch/m68k/include/asm/fb_mm.h | |||
diff --git a/arch/m68knommu/include/asm/fb.h b/arch/m68k/include/asm/fb_no.h index c7df3803099..c7df3803099 100644 --- a/arch/m68knommu/include/asm/fb.h +++ b/arch/m68k/include/asm/fb_no.h | |||
diff --git a/include/asm-m68k/fbio.h b/arch/m68k/include/asm/fbio.h index b9215a0907d..b9215a0907d 100644 --- a/include/asm-m68k/fbio.h +++ b/arch/m68k/include/asm/fbio.h | |||
diff --git a/include/asm-m68k/fcntl.h b/arch/m68k/include/asm/fcntl.h index 1c369b20dc4..1c369b20dc4 100644 --- a/include/asm-m68k/fcntl.h +++ b/arch/m68k/include/asm/fcntl.h | |||
diff --git a/arch/m68knommu/include/asm/flat.h b/arch/m68k/include/asm/flat.h index 814b5174a8e..814b5174a8e 100644 --- a/arch/m68knommu/include/asm/flat.h +++ b/arch/m68k/include/asm/flat.h | |||
diff --git a/include/asm-m68k/floppy.h b/arch/m68k/include/asm/floppy.h index 697d50393dd..697d50393dd 100644 --- a/include/asm-m68k/floppy.h +++ b/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 00000000000..e19bc5ed9c3 --- /dev/null +++ b/arch/m68k/include/asm/fpu.h | |||
@@ -0,0 +1,5 @@ | |||
1 | #ifdef __uClinux__ | ||
2 | #include "fpu_no.h" | ||
3 | #else | ||
4 | #include "fpu_mm.h" | ||
5 | #endif | ||
diff --git a/include/asm-m68k/fpu.h b/arch/m68k/include/asm/fpu_mm.h index ffb6b8cfc6d..ffb6b8cfc6d 100644 --- a/include/asm-m68k/fpu.h +++ b/arch/m68k/include/asm/fpu_mm.h | |||
diff --git a/arch/m68knommu/include/asm/fpu.h b/arch/m68k/include/asm/fpu_no.h index b16b2e4fca2..b16b2e4fca2 100644 --- a/arch/m68knommu/include/asm/fpu.h +++ b/arch/m68k/include/asm/fpu_no.h | |||
diff --git a/arch/m68knommu/include/asm/futex.h b/arch/m68k/include/asm/futex.h index 6a332a9f099..6a332a9f099 100644 --- a/arch/m68knommu/include/asm/futex.h +++ b/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 00000000000..56d0d5db231 --- /dev/null +++ b/arch/m68k/include/asm/hardirq.h | |||
@@ -0,0 +1,5 @@ | |||
1 | #ifdef __uClinux__ | ||
2 | #include "hardirq_no.h" | ||
3 | #else | ||
4 | #include "hardirq_mm.h" | ||
5 | #endif | ||
diff --git a/include/asm-m68k/hardirq.h b/arch/m68k/include/asm/hardirq_mm.h index 394ee946015..394ee946015 100644 --- a/include/asm-m68k/hardirq.h +++ b/arch/m68k/include/asm/hardirq_mm.h | |||
diff --git a/arch/m68knommu/include/asm/hardirq.h b/arch/m68k/include/asm/hardirq_no.h index bfad28149a4..bfad28149a4 100644 --- a/arch/m68knommu/include/asm/hardirq.h +++ b/arch/m68k/include/asm/hardirq_no.h | |||
diff --git a/include/asm-m68k/hp300hw.h b/arch/m68k/include/asm/hp300hw.h index d998ea67c19..d998ea67c19 100644 --- a/include/asm-m68k/hp300hw.h +++ b/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 00000000000..e1952601589 --- /dev/null +++ b/arch/m68k/include/asm/hw_irq.h | |||
@@ -0,0 +1,5 @@ | |||
1 | #ifdef __uClinux__ | ||
2 | #include "hw_irq_no.h" | ||
3 | #else | ||
4 | #include "hw_irq_mm.h" | ||
5 | #endif | ||
diff --git a/include/asm-m68k/hw_irq.h b/arch/m68k/include/asm/hw_irq_mm.h index eacef0951fb..eacef0951fb 100644 --- a/include/asm-m68k/hw_irq.h +++ b/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 index f3ec9e5ae04..f3ec9e5ae04 100644 --- a/arch/m68knommu/include/asm/hw_irq.h +++ b/arch/m68k/include/asm/hw_irq_no.h | |||
diff --git a/include/asm-m68k/hwtest.h b/arch/m68k/include/asm/hwtest.h index 402c8a4401f..402c8a4401f 100644 --- a/include/asm-m68k/hwtest.h +++ b/arch/m68k/include/asm/hwtest.h | |||
diff --git a/include/asm-m68k/ide.h b/arch/m68k/include/asm/ide.h index b996a3c8cff..b996a3c8cff 100644 --- a/include/asm-m68k/ide.h +++ b/arch/m68k/include/asm/ide.h | |||
diff --git a/include/asm-m68k/idprom.h b/arch/m68k/include/asm/idprom.h index 160616a89e0..160616a89e0 100644 --- a/include/asm-m68k/idprom.h +++ b/arch/m68k/include/asm/idprom.h | |||
diff --git a/include/asm-m68k/intersil.h b/arch/m68k/include/asm/intersil.h index f482902cac8..f482902cac8 100644 --- a/include/asm-m68k/intersil.h +++ b/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 00000000000..c7210ba184e --- /dev/null +++ b/arch/m68k/include/asm/io.h | |||
@@ -0,0 +1,5 @@ | |||
1 | #ifdef __uClinux__ | ||
2 | #include "io_no.h" | ||
3 | #else | ||
4 | #include "io_mm.h" | ||
5 | #endif | ||
diff --git a/include/asm-m68k/io.h b/arch/m68k/include/asm/io_mm.h index 9e673e3bd43..9e673e3bd43 100644 --- a/include/asm-m68k/io.h +++ b/arch/m68k/include/asm/io_mm.h | |||
diff --git a/arch/m68knommu/include/asm/io.h b/arch/m68k/include/asm/io_no.h index 6adef1ee208..6adef1ee208 100644 --- a/arch/m68knommu/include/asm/io.h +++ b/arch/m68k/include/asm/io_no.h | |||
diff --git a/arch/m68knommu/include/asm/ioctl.h b/arch/m68k/include/asm/ioctl.h index b279fe06dfe..b279fe06dfe 100644 --- a/arch/m68knommu/include/asm/ioctl.h +++ b/arch/m68k/include/asm/ioctl.h | |||
diff --git a/include/asm-m68k/ioctls.h b/arch/m68k/include/asm/ioctls.h index b8d2f4be7fd..b8d2f4be7fd 100644 --- a/include/asm-m68k/ioctls.h +++ b/arch/m68k/include/asm/ioctls.h | |||
diff --git a/include/asm-m68k/ipcbuf.h b/arch/m68k/include/asm/ipcbuf.h index a623ea3f095..a623ea3f095 100644 --- a/include/asm-m68k/ipcbuf.h +++ b/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 00000000000..d031416595b --- /dev/null +++ b/arch/m68k/include/asm/irq.h | |||
@@ -0,0 +1,5 @@ | |||
1 | #ifdef __uClinux__ | ||
2 | #include "irq_no.h" | ||
3 | #else | ||
4 | #include "irq_mm.h" | ||
5 | #endif | ||
diff --git a/include/asm-m68k/irq.h b/arch/m68k/include/asm/irq_mm.h index 226bfc0f21b..226bfc0f21b 100644 --- a/include/asm-m68k/irq.h +++ b/arch/m68k/include/asm/irq_mm.h | |||
diff --git a/arch/m68knommu/include/asm/irq.h b/arch/m68k/include/asm/irq_no.h index 9373c31ac87..9373c31ac87 100644 --- a/arch/m68knommu/include/asm/irq.h +++ b/arch/m68k/include/asm/irq_no.h | |||
diff --git a/arch/m68knommu/include/asm/irq_regs.h b/arch/m68k/include/asm/irq_regs.h index 3dd9c0b7027..3dd9c0b7027 100644 --- a/arch/m68knommu/include/asm/irq_regs.h +++ b/arch/m68k/include/asm/irq_regs.h | |||
diff --git a/arch/m68knommu/include/asm/kdebug.h b/arch/m68k/include/asm/kdebug.h index 6ece1b03766..6ece1b03766 100644 --- a/arch/m68knommu/include/asm/kdebug.h +++ b/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 00000000000..045d9fd122a --- /dev/null +++ b/arch/m68k/include/asm/kmap_types.h | |||
@@ -0,0 +1,5 @@ | |||
1 | #ifdef __uClinux__ | ||
2 | #include "kmap_types_no.h" | ||
3 | #else | ||
4 | #include "kmap_types_mm.h" | ||
5 | #endif | ||
diff --git a/include/asm-m68k/kmap_types.h b/arch/m68k/include/asm/kmap_types_mm.h index c843c63d380..c843c63d380 100644 --- a/include/asm-m68k/kmap_types.h +++ b/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 index bfb6707575d..bfb6707575d 100644 --- a/arch/m68knommu/include/asm/kmap_types.h +++ b/arch/m68k/include/asm/kmap_types_no.h | |||
diff --git a/include/asm-m68k/linkage.h b/arch/m68k/include/asm/linkage.h index 5a822bb790f..5a822bb790f 100644 --- a/include/asm-m68k/linkage.h +++ b/arch/m68k/include/asm/linkage.h | |||
diff --git a/include/asm-m68k/local.h b/arch/m68k/include/asm/local.h index 6c259263e1f..6c259263e1f 100644 --- a/include/asm-m68k/local.h +++ b/arch/m68k/include/asm/local.h | |||
diff --git a/arch/m68knommu/include/asm/m5206sim.h b/arch/m68k/include/asm/m5206sim.h index 7e3594dea88..7e3594dea88 100644 --- a/arch/m68knommu/include/asm/m5206sim.h +++ b/arch/m68k/include/asm/m5206sim.h | |||
diff --git a/arch/m68knommu/include/asm/m520xsim.h b/arch/m68k/include/asm/m520xsim.h index 49d016e6391..49d016e6391 100644 --- a/arch/m68knommu/include/asm/m520xsim.h +++ b/arch/m68k/include/asm/m520xsim.h | |||
diff --git a/arch/m68knommu/include/asm/m523xsim.h b/arch/m68k/include/asm/m523xsim.h index bf397313e93..bf397313e93 100644 --- a/arch/m68knommu/include/asm/m523xsim.h +++ b/arch/m68k/include/asm/m523xsim.h | |||
diff --git a/arch/m68knommu/include/asm/m5249sim.h b/arch/m68k/include/asm/m5249sim.h index 366eb8602d2..366eb8602d2 100644 --- a/arch/m68knommu/include/asm/m5249sim.h +++ b/arch/m68k/include/asm/m5249sim.h | |||
diff --git a/arch/m68knommu/include/asm/m5272sim.h b/arch/m68k/include/asm/m5272sim.h index 6217edc2113..6217edc2113 100644 --- a/arch/m68knommu/include/asm/m5272sim.h +++ b/arch/m68k/include/asm/m5272sim.h | |||
diff --git a/arch/m68knommu/include/asm/m527xsim.h b/arch/m68k/include/asm/m527xsim.h index 1f63ab3fb3e..1f63ab3fb3e 100644 --- a/arch/m68knommu/include/asm/m527xsim.h +++ b/arch/m68k/include/asm/m527xsim.h | |||
diff --git a/arch/m68knommu/include/asm/m528xsim.h b/arch/m68k/include/asm/m528xsim.h index 28bf783a5d6..28bf783a5d6 100644 --- a/arch/m68knommu/include/asm/m528xsim.h +++ b/arch/m68k/include/asm/m528xsim.h | |||
diff --git a/arch/m68knommu/include/asm/m5307sim.h b/arch/m68k/include/asm/m5307sim.h index 5886728409c..5886728409c 100644 --- a/arch/m68knommu/include/asm/m5307sim.h +++ b/arch/m68k/include/asm/m5307sim.h | |||
diff --git a/arch/m68knommu/include/asm/m532xsim.h b/arch/m68k/include/asm/m532xsim.h index 1835fd20a82..1835fd20a82 100644 --- a/arch/m68knommu/include/asm/m532xsim.h +++ b/arch/m68k/include/asm/m532xsim.h | |||
diff --git a/arch/m68knommu/include/asm/m5407sim.h b/arch/m68k/include/asm/m5407sim.h index cc22c4a5300..cc22c4a5300 100644 --- a/arch/m68knommu/include/asm/m5407sim.h +++ b/arch/m68k/include/asm/m5407sim.h | |||
diff --git a/arch/m68knommu/include/asm/m68360.h b/arch/m68k/include/asm/m68360.h index eb7d39ef285..eb7d39ef285 100644 --- a/arch/m68knommu/include/asm/m68360.h +++ b/arch/m68k/include/asm/m68360.h | |||
diff --git a/arch/m68knommu/include/asm/m68360_enet.h b/arch/m68k/include/asm/m68360_enet.h index c36f4d05920..c36f4d05920 100644 --- a/arch/m68knommu/include/asm/m68360_enet.h +++ b/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 index e6088bbce93..e6088bbce93 100644 --- a/arch/m68knommu/include/asm/m68360_pram.h +++ b/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 index 6d40f4d18e1..6d40f4d18e1 100644 --- a/arch/m68knommu/include/asm/m68360_quicc.h +++ b/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 index d57217ca4f2..d57217ca4f2 100644 --- a/arch/m68knommu/include/asm/m68360_regs.h +++ b/arch/m68k/include/asm/m68360_regs.h | |||
diff --git a/include/asm-m68k/mac_asc.h b/arch/m68k/include/asm/mac_asc.h index fc2e5467b41..fc2e5467b41 100644 --- a/include/asm-m68k/mac_asc.h +++ b/arch/m68k/include/asm/mac_asc.h | |||
diff --git a/include/asm-m68k/mac_baboon.h b/arch/m68k/include/asm/mac_baboon.h index c2a042b8c34..c2a042b8c34 100644 --- a/include/asm-m68k/mac_baboon.h +++ b/arch/m68k/include/asm/mac_baboon.h | |||
diff --git a/include/asm-m68k/mac_iop.h b/arch/m68k/include/asm/mac_iop.h index a2c7e6fcca3..a2c7e6fcca3 100644 --- a/include/asm-m68k/mac_iop.h +++ b/arch/m68k/include/asm/mac_iop.h | |||
diff --git a/include/asm-m68k/mac_mouse.h b/arch/m68k/include/asm/mac_mouse.h index 39a5c292eae..39a5c292eae 100644 --- a/include/asm-m68k/mac_mouse.h +++ b/arch/m68k/include/asm/mac_mouse.h | |||
diff --git a/include/asm-m68k/mac_oss.h b/arch/m68k/include/asm/mac_oss.h index 7221f725193..7221f725193 100644 --- a/include/asm-m68k/mac_oss.h +++ b/arch/m68k/include/asm/mac_oss.h | |||
diff --git a/include/asm-m68k/mac_psc.h b/arch/m68k/include/asm/mac_psc.h index 7808bb0b232..7808bb0b232 100644 --- a/include/asm-m68k/mac_psc.h +++ b/arch/m68k/include/asm/mac_psc.h | |||
diff --git a/include/asm-m68k/mac_via.h b/arch/m68k/include/asm/mac_via.h index 39afb438b65..39afb438b65 100644 --- a/include/asm-m68k/mac_via.h +++ b/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 00000000000..fc24b6fc550 --- /dev/null +++ b/arch/m68k/include/asm/machdep.h | |||
@@ -0,0 +1,5 @@ | |||
1 | #ifdef __uClinux__ | ||
2 | #include "machdep_no.h" | ||
3 | #else | ||
4 | #include "machdep_mm.h" | ||
5 | #endif | ||
diff --git a/include/asm-m68k/machdep.h b/arch/m68k/include/asm/machdep_mm.h index 5637dcef314..5637dcef314 100644 --- a/include/asm-m68k/machdep.h +++ b/arch/m68k/include/asm/machdep_mm.h | |||
diff --git a/arch/m68knommu/include/asm/machdep.h b/arch/m68k/include/asm/machdep_no.h index de9f47a51cc..de9f47a51cc 100644 --- a/arch/m68knommu/include/asm/machdep.h +++ b/arch/m68k/include/asm/machdep_no.h | |||
diff --git a/include/asm-m68k/machines.h b/arch/m68k/include/asm/machines.h index be667e84f01..be667e84f01 100644 --- a/include/asm-m68k/machines.h +++ b/arch/m68k/include/asm/machines.h | |||
diff --git a/include/asm-m68k/machw.h b/arch/m68k/include/asm/machw.h index 2b4de0c2ce4..2b4de0c2ce4 100644 --- a/include/asm-m68k/machw.h +++ b/arch/m68k/include/asm/machw.h | |||
diff --git a/include/asm-m68k/macintosh.h b/arch/m68k/include/asm/macintosh.h index 05309f7e3d0..05309f7e3d0 100644 --- a/include/asm-m68k/macintosh.h +++ b/arch/m68k/include/asm/macintosh.h | |||
diff --git a/include/asm-m68k/macints.h b/arch/m68k/include/asm/macints.h index 679c48ab440..679c48ab440 100644 --- a/include/asm-m68k/macints.h +++ b/arch/m68k/include/asm/macints.h | |||
diff --git a/include/asm-m68k/math-emu.h b/arch/m68k/include/asm/math-emu.h index ddfab96403c..ddfab96403c 100644 --- a/include/asm-m68k/math-emu.h +++ b/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 00000000000..fb90dcf7842 --- /dev/null +++ b/arch/m68k/include/asm/mc146818rtc.h | |||
@@ -0,0 +1,5 @@ | |||
1 | #ifdef __uClinux__ | ||
2 | #include "mc146818rtc_no.h" | ||
3 | #else | ||
4 | #include "mc146818rtc_mm.h" | ||
5 | #endif | ||
diff --git a/include/asm-m68k/mc146818rtc.h b/arch/m68k/include/asm/mc146818rtc_mm.h index 9f70a01f73d..9f70a01f73d 100644 --- a/include/asm-m68k/mc146818rtc.h +++ b/arch/m68k/include/asm/mc146818rtc_mm.h | |||
diff --git a/arch/m68knommu/include/asm/mc146818rtc.h b/arch/m68k/include/asm/mc146818rtc_no.h index 907a0481a14..907a0481a14 100644 --- a/arch/m68knommu/include/asm/mc146818rtc.h +++ b/arch/m68k/include/asm/mc146818rtc_no.h | |||
diff --git a/arch/m68knommu/include/asm/mcfcache.h b/arch/m68k/include/asm/mcfcache.h index c042634fada..c042634fada 100644 --- a/arch/m68knommu/include/asm/mcfcache.h +++ b/arch/m68k/include/asm/mcfcache.h | |||
diff --git a/arch/m68knommu/include/asm/mcfdma.h b/arch/m68k/include/asm/mcfdma.h index 705c52c79cd..705c52c79cd 100644 --- a/arch/m68knommu/include/asm/mcfdma.h +++ b/arch/m68k/include/asm/mcfdma.h | |||
diff --git a/arch/m68knommu/include/asm/mcfmbus.h b/arch/m68k/include/asm/mcfmbus.h index 319899c47a2..319899c47a2 100644 --- a/arch/m68knommu/include/asm/mcfmbus.h +++ b/arch/m68k/include/asm/mcfmbus.h | |||
diff --git a/arch/m68knommu/include/asm/mcfne.h b/arch/m68k/include/asm/mcfne.h index 431f63aadd0..431f63aadd0 100644 --- a/arch/m68knommu/include/asm/mcfne.h +++ b/arch/m68k/include/asm/mcfne.h | |||
diff --git a/arch/m68knommu/include/asm/mcfpci.h b/arch/m68k/include/asm/mcfpci.h index f1507dd06ec..f1507dd06ec 100644 --- a/arch/m68knommu/include/asm/mcfpci.h +++ b/arch/m68k/include/asm/mcfpci.h | |||
diff --git a/arch/m68knommu/include/asm/mcfpit.h b/arch/m68k/include/asm/mcfpit.h index f570cf64fd2..f570cf64fd2 100644 --- a/arch/m68knommu/include/asm/mcfpit.h +++ b/arch/m68k/include/asm/mcfpit.h | |||
diff --git a/arch/m68knommu/include/asm/mcfsim.h b/arch/m68k/include/asm/mcfsim.h index da3f2ceff3a..da3f2ceff3a 100644 --- a/arch/m68knommu/include/asm/mcfsim.h +++ b/arch/m68k/include/asm/mcfsim.h | |||
diff --git a/arch/m68knommu/include/asm/mcfsmc.h b/arch/m68k/include/asm/mcfsmc.h index 2d7a4dbd968..2d7a4dbd968 100644 --- a/arch/m68knommu/include/asm/mcfsmc.h +++ b/arch/m68k/include/asm/mcfsmc.h | |||
diff --git a/arch/m68knommu/include/asm/mcftimer.h b/arch/m68k/include/asm/mcftimer.h index 0f90f6d2227..0f90f6d2227 100644 --- a/arch/m68knommu/include/asm/mcftimer.h +++ b/arch/m68k/include/asm/mcftimer.h | |||
diff --git a/arch/m68knommu/include/asm/mcfuart.h b/arch/m68k/include/asm/mcfuart.h index ef229387361..ef229387361 100644 --- a/arch/m68knommu/include/asm/mcfuart.h +++ b/arch/m68k/include/asm/mcfuart.h | |||
diff --git a/arch/m68knommu/include/asm/mcfwdebug.h b/arch/m68k/include/asm/mcfwdebug.h index 27f70e45d70..27f70e45d70 100644 --- a/arch/m68knommu/include/asm/mcfwdebug.h +++ b/arch/m68k/include/asm/mcfwdebug.h | |||
diff --git a/include/asm-m68k/md.h b/arch/m68k/include/asm/md.h index d2f78f226f3..d2f78f226f3 100644 --- a/include/asm-m68k/md.h +++ b/arch/m68k/include/asm/md.h | |||
diff --git a/include/asm-m68k/mman.h b/arch/m68k/include/asm/mman.h index 1626d37f489..1626d37f489 100644 --- a/include/asm-m68k/mman.h +++ b/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 00000000000..a81d3946675 --- /dev/null +++ b/arch/m68k/include/asm/mmu.h | |||
@@ -0,0 +1,5 @@ | |||
1 | #ifdef __uClinux__ | ||
2 | #include "mmu_no.h" | ||
3 | #else | ||
4 | #include "mmu_mm.h" | ||
5 | #endif | ||
diff --git a/arch/m68k/include/asm/mmu_context.h b/arch/m68k/include/asm/mmu_context.h new file mode 100644 index 00000000000..b440928fc6c --- /dev/null +++ b/arch/m68k/include/asm/mmu_context.h | |||
@@ -0,0 +1,5 @@ | |||
1 | #ifdef __uClinux__ | ||
2 | #include "mmu_context_no.h" | ||
3 | #else | ||
4 | #include "mmu_context_mm.h" | ||
5 | #endif | ||
diff --git a/include/asm-m68k/mmu_context.h b/arch/m68k/include/asm/mmu_context_mm.h index 894dacbcee1..894dacbcee1 100644 --- a/include/asm-m68k/mmu_context.h +++ b/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 index 9ccee4278c9..9ccee4278c9 100644 --- a/arch/m68knommu/include/asm/mmu_context.h +++ b/arch/m68k/include/asm/mmu_context_no.h | |||
diff --git a/include/asm-m68k/mmu.h b/arch/m68k/include/asm/mmu_mm.h index ccd36d26615..ccd36d26615 100644 --- a/include/asm-m68k/mmu.h +++ b/arch/m68k/include/asm/mmu_mm.h | |||
diff --git a/arch/m68knommu/include/asm/mmu.h b/arch/m68k/include/asm/mmu_no.h index e2da1e6f09f..e2da1e6f09f 100644 --- a/arch/m68knommu/include/asm/mmu.h +++ b/arch/m68k/include/asm/mmu_no.h | |||
diff --git a/include/asm-m68k/mmzone.h b/arch/m68k/include/asm/mmzone.h index e1f1ec7b700..e1f1ec7b700 100644 --- a/include/asm-m68k/mmzone.h +++ b/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 00000000000..79b59d137dd --- /dev/null +++ b/arch/m68k/include/asm/module.h | |||
@@ -0,0 +1,5 @@ | |||
1 | #ifdef __uClinux__ | ||
2 | #include "module_no.h" | ||
3 | #else | ||
4 | #include "module_mm.h" | ||
5 | #endif | ||
diff --git a/include/asm-m68k/module.h b/arch/m68k/include/asm/module_mm.h index 382d20a6fc1..382d20a6fc1 100644 --- a/include/asm-m68k/module.h +++ b/arch/m68k/include/asm/module_mm.h | |||
diff --git a/arch/m68knommu/include/asm/module.h b/arch/m68k/include/asm/module_no.h index 2e45ab50b23..2e45ab50b23 100644 --- a/arch/m68knommu/include/asm/module.h +++ b/arch/m68k/include/asm/module_no.h | |||
diff --git a/include/asm-m68k/motorola_pgalloc.h b/arch/m68k/include/asm/motorola_pgalloc.h index d08bf6261df..d08bf6261df 100644 --- a/include/asm-m68k/motorola_pgalloc.h +++ b/arch/m68k/include/asm/motorola_pgalloc.h | |||
diff --git a/include/asm-m68k/motorola_pgtable.h b/arch/m68k/include/asm/motorola_pgtable.h index 8e9a8a754dd..8e9a8a754dd 100644 --- a/include/asm-m68k/motorola_pgtable.h +++ b/arch/m68k/include/asm/motorola_pgtable.h | |||
diff --git a/include/asm-m68k/movs.h b/arch/m68k/include/asm/movs.h index 67dbea36960..67dbea36960 100644 --- a/include/asm-m68k/movs.h +++ b/arch/m68k/include/asm/movs.h | |||
diff --git a/include/asm-m68k/msgbuf.h b/arch/m68k/include/asm/msgbuf.h index 243cb798de8..243cb798de8 100644 --- a/include/asm-m68k/msgbuf.h +++ b/arch/m68k/include/asm/msgbuf.h | |||
diff --git a/arch/m68knommu/include/asm/mutex.h b/arch/m68k/include/asm/mutex.h index 458c1f7fbc1..458c1f7fbc1 100644 --- a/arch/m68knommu/include/asm/mutex.h +++ b/arch/m68k/include/asm/mutex.h | |||
diff --git a/include/asm-m68k/mvme147hw.h b/arch/m68k/include/asm/mvme147hw.h index b8104310847..b8104310847 100644 --- a/include/asm-m68k/mvme147hw.h +++ b/arch/m68k/include/asm/mvme147hw.h | |||
diff --git a/include/asm-m68k/mvme16xhw.h b/arch/m68k/include/asm/mvme16xhw.h index 6117f56653d..6117f56653d 100644 --- a/include/asm-m68k/mvme16xhw.h +++ b/arch/m68k/include/asm/mvme16xhw.h | |||
diff --git a/arch/m68knommu/include/asm/nettel.h b/arch/m68k/include/asm/nettel.h index 0299f6a2dee..0299f6a2dee 100644 --- a/arch/m68knommu/include/asm/nettel.h +++ b/arch/m68k/include/asm/nettel.h | |||
diff --git a/include/asm-m68k/nubus.h b/arch/m68k/include/asm/nubus.h index d6be9976f1a..d6be9976f1a 100644 --- a/include/asm-m68k/nubus.h +++ b/arch/m68k/include/asm/nubus.h | |||
diff --git a/include/asm-m68k/openprom.h b/arch/m68k/include/asm/openprom.h index d33cdadf78e..d33cdadf78e 100644 --- a/include/asm-m68k/openprom.h +++ b/arch/m68k/include/asm/openprom.h | |||
diff --git a/include/asm-m68k/oplib.h b/arch/m68k/include/asm/oplib.h index f082d03336b..f082d03336b 100644 --- a/include/asm-m68k/oplib.h +++ b/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 00000000000..f2b4480cc98 --- /dev/null +++ b/arch/m68k/include/asm/page.h | |||
@@ -0,0 +1,5 @@ | |||
1 | #ifdef __uClinux__ | ||
2 | #include "page_no.h" | ||
3 | #else | ||
4 | #include "page_mm.h" | ||
5 | #endif | ||
diff --git a/include/asm-m68k/page.h b/arch/m68k/include/asm/page_mm.h index a34b8bad784..a34b8bad784 100644 --- a/include/asm-m68k/page.h +++ b/arch/m68k/include/asm/page_mm.h | |||
diff --git a/arch/m68knommu/include/asm/page.h b/arch/m68k/include/asm/page_no.h index 3a1ede4544c..3a1ede4544c 100644 --- a/arch/m68knommu/include/asm/page.h +++ b/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 00000000000..66455c849fb --- /dev/null +++ b/arch/m68k/include/asm/page_offset.h | |||
@@ -0,0 +1,5 @@ | |||
1 | #ifdef __uClinux__ | ||
2 | #include "page_offset_no.h" | ||
3 | #else | ||
4 | #include "page_offset_mm.h" | ||
5 | #endif | ||
diff --git a/include/asm-m68k/page_offset.h b/arch/m68k/include/asm/page_offset_mm.h index 1cbdb7f30ac..1cbdb7f30ac 100644 --- a/include/asm-m68k/page_offset.h +++ b/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 index d4e73e0ba64..d4e73e0ba64 100644 --- a/arch/m68knommu/include/asm/page_offset.h +++ b/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 00000000000..40d1112a458 --- /dev/null +++ b/arch/m68k/include/asm/param.h | |||
@@ -0,0 +1,5 @@ | |||
1 | #ifdef __uClinux__ | ||
2 | #include "param_no.h" | ||
3 | #else | ||
4 | #include "param_mm.h" | ||
5 | #endif | ||
diff --git a/include/asm-m68k/param.h b/arch/m68k/include/asm/param_mm.h index 536a2788835..536a2788835 100644 --- a/include/asm-m68k/param.h +++ b/arch/m68k/include/asm/param_mm.h | |||
diff --git a/arch/m68knommu/include/asm/param.h b/arch/m68k/include/asm/param_no.h index 6044397adb6..6044397adb6 100644 --- a/arch/m68knommu/include/asm/param.h +++ b/arch/m68k/include/asm/param_no.h | |||
diff --git a/include/asm-m68k/parport.h b/arch/m68k/include/asm/parport.h index 646b1872f73..646b1872f73 100644 --- a/include/asm-m68k/parport.h +++ b/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 00000000000..dbea9537308 --- /dev/null +++ b/arch/m68k/include/asm/pci.h | |||
@@ -0,0 +1,5 @@ | |||
1 | #ifdef __uClinux__ | ||
2 | #include "pci_no.h" | ||
3 | #else | ||
4 | #include "pci_mm.h" | ||
5 | #endif | ||
diff --git a/include/asm-m68k/pci.h b/arch/m68k/include/asm/pci_mm.h index 4ad0aea48ab..4ad0aea48ab 100644 --- a/include/asm-m68k/pci.h +++ b/arch/m68k/include/asm/pci_mm.h | |||
diff --git a/arch/m68knommu/include/asm/pci.h b/arch/m68k/include/asm/pci_no.h index a13f3cc8745..9abbc03c73e 100644 --- a/arch/m68knommu/include/asm/pci.h +++ b/arch/m68k/include/asm/pci_no.h | |||
@@ -1,7 +1,7 @@ | |||
1 | #ifndef M68KNOMMU_PCI_H | 1 | #ifndef M68KNOMMU_PCI_H |
2 | #define M68KNOMMU_PCI_H | 2 | #define M68KNOMMU_PCI_H |
3 | 3 | ||
4 | #include <asm-m68k/pci.h> | 4 | #include <asm/pci_mm.h> |
5 | 5 | ||
6 | #ifdef CONFIG_COMEMPCI | 6 | #ifdef CONFIG_COMEMPCI |
7 | /* | 7 | /* |
diff --git a/include/asm-m68k/percpu.h b/arch/m68k/include/asm/percpu.h index 0859d048faf..0859d048faf 100644 --- a/include/asm-m68k/percpu.h +++ b/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 00000000000..059cb73e78f --- /dev/null +++ b/arch/m68k/include/asm/pgalloc.h | |||
@@ -0,0 +1,5 @@ | |||
1 | #ifdef __uClinux__ | ||
2 | #include "pgalloc_no.h" | ||
3 | #else | ||
4 | #include "pgalloc_mm.h" | ||
5 | #endif | ||
diff --git a/include/asm-m68k/pgalloc.h b/arch/m68k/include/asm/pgalloc_mm.h index 4cb1a57ab76..4cb1a57ab76 100644 --- a/include/asm-m68k/pgalloc.h +++ b/arch/m68k/include/asm/pgalloc_mm.h | |||
diff --git a/arch/m68knommu/include/asm/pgalloc.h b/arch/m68k/include/asm/pgalloc_no.h index d6352f671ec..d6352f671ec 100644 --- a/arch/m68knommu/include/asm/pgalloc.h +++ b/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 00000000000..ee6759eb445 --- /dev/null +++ b/arch/m68k/include/asm/pgtable.h | |||
@@ -0,0 +1,5 @@ | |||
1 | #ifdef __uClinux__ | ||
2 | #include "pgtable_no.h" | ||
3 | #else | ||
4 | #include "pgtable_mm.h" | ||
5 | #endif | ||
diff --git a/include/asm-m68k/pgtable.h b/arch/m68k/include/asm/pgtable_mm.h index 0b604f0f192..0b604f0f192 100644 --- a/include/asm-m68k/pgtable.h +++ b/arch/m68k/include/asm/pgtable_mm.h | |||
diff --git a/arch/m68knommu/include/asm/pgtable.h b/arch/m68k/include/asm/pgtable_no.h index 46251016e82..46251016e82 100644 --- a/arch/m68knommu/include/asm/pgtable.h +++ b/arch/m68k/include/asm/pgtable_no.h | |||
diff --git a/include/asm-m68k/poll.h b/arch/m68k/include/asm/poll.h index f080fcdb61b..f080fcdb61b 100644 --- a/include/asm-m68k/poll.h +++ b/arch/m68k/include/asm/poll.h | |||
diff --git a/include/asm-m68k/posix_types.h b/arch/m68k/include/asm/posix_types.h index 63cdcc142d9..63cdcc142d9 100644 --- a/include/asm-m68k/posix_types.h +++ b/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 00000000000..fc3f2c22f2b --- /dev/null +++ b/arch/m68k/include/asm/processor.h | |||
@@ -0,0 +1,5 @@ | |||
1 | #ifdef __uClinux__ | ||
2 | #include "processor_no.h" | ||
3 | #else | ||
4 | #include "processor_mm.h" | ||
5 | #endif | ||
diff --git a/include/asm-m68k/processor.h b/arch/m68k/include/asm/processor_mm.h index 1f61ef53f0e..1f61ef53f0e 100644 --- a/include/asm-m68k/processor.h +++ b/arch/m68k/include/asm/processor_mm.h | |||
diff --git a/arch/m68knommu/include/asm/processor.h b/arch/m68k/include/asm/processor_no.h index 91cba18acdd..91cba18acdd 100644 --- a/arch/m68knommu/include/asm/processor.h +++ b/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 00000000000..e83cd2f6610 --- /dev/null +++ b/arch/m68k/include/asm/ptrace.h | |||
@@ -0,0 +1,5 @@ | |||
1 | #ifdef __uClinux__ | ||
2 | #include "ptrace_no.h" | ||
3 | #else | ||
4 | #include "ptrace_mm.h" | ||
5 | #endif | ||
diff --git a/include/asm-m68k/ptrace.h b/arch/m68k/include/asm/ptrace_mm.h index 57e763d79bf..57e763d79bf 100644 --- a/include/asm-m68k/ptrace.h +++ b/arch/m68k/include/asm/ptrace_mm.h | |||
diff --git a/arch/m68knommu/include/asm/ptrace.h b/arch/m68k/include/asm/ptrace_no.h index 8c9194b9854..8c9194b9854 100644 --- a/arch/m68knommu/include/asm/ptrace.h +++ b/arch/m68k/include/asm/ptrace_no.h | |||
diff --git a/include/asm-m68k/q40_master.h b/arch/m68k/include/asm/q40_master.h index 3907a09d4fc..3907a09d4fc 100644 --- a/include/asm-m68k/q40_master.h +++ b/arch/m68k/include/asm/q40_master.h | |||
diff --git a/include/asm-m68k/q40ints.h b/arch/m68k/include/asm/q40ints.h index 3d970afb708..3d970afb708 100644 --- a/include/asm-m68k/q40ints.h +++ b/arch/m68k/include/asm/q40ints.h | |||
diff --git a/arch/m68knommu/include/asm/quicc_simple.h b/arch/m68k/include/asm/quicc_simple.h index c3636932d4b..c3636932d4b 100644 --- a/arch/m68knommu/include/asm/quicc_simple.h +++ b/arch/m68k/include/asm/quicc_simple.h | |||
diff --git a/include/asm-m68k/raw_io.h b/arch/m68k/include/asm/raw_io.h index d9eb9834ccc..d9eb9834ccc 100644 --- a/include/asm-m68k/raw_io.h +++ b/arch/m68k/include/asm/raw_io.h | |||
diff --git a/include/asm-m68k/resource.h b/arch/m68k/include/asm/resource.h index e7d35019f33..e7d35019f33 100644 --- a/include/asm-m68k/resource.h +++ b/arch/m68k/include/asm/resource.h | |||
diff --git a/include/asm-m68k/rtc.h b/arch/m68k/include/asm/rtc.h index 5d3e0385984..5d3e0385984 100644 --- a/include/asm-m68k/rtc.h +++ b/arch/m68k/include/asm/rtc.h | |||
diff --git a/include/asm-m68k/sbus.h b/arch/m68k/include/asm/sbus.h index bfe3ba147f2..bfe3ba147f2 100644 --- a/include/asm-m68k/sbus.h +++ b/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 00000000000..b7e52863625 --- /dev/null +++ b/arch/m68k/include/asm/scatterlist.h | |||
@@ -0,0 +1,5 @@ | |||
1 | #ifdef __uClinux__ | ||
2 | #include "scatterlist_no.h" | ||
3 | #else | ||
4 | #include "scatterlist_mm.h" | ||
5 | #endif | ||
diff --git a/include/asm-m68k/scatterlist.h b/arch/m68k/include/asm/scatterlist_mm.h index d3a7a0edfec..d3a7a0edfec 100644 --- a/include/asm-m68k/scatterlist.h +++ b/arch/m68k/include/asm/scatterlist_mm.h | |||
diff --git a/arch/m68knommu/include/asm/scatterlist.h b/arch/m68k/include/asm/scatterlist_no.h index afc4788b0d2..afc4788b0d2 100644 --- a/arch/m68knommu/include/asm/scatterlist.h +++ b/arch/m68k/include/asm/scatterlist_no.h | |||
diff --git a/include/asm-m68k/sections.h b/arch/m68k/include/asm/sections.h index d64967ecfec..d64967ecfec 100644 --- a/include/asm-m68k/sections.h +++ b/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 00000000000..82583bc004b --- /dev/null +++ b/arch/m68k/include/asm/segment.h | |||
@@ -0,0 +1,5 @@ | |||
1 | #ifdef __uClinux__ | ||
2 | #include "segment_no.h" | ||
3 | #else | ||
4 | #include "segment_mm.h" | ||
5 | #endif | ||
diff --git a/include/asm-m68k/segment.h b/arch/m68k/include/asm/segment_mm.h index 7b0b2d3127f..7b0b2d3127f 100644 --- a/include/asm-m68k/segment.h +++ b/arch/m68k/include/asm/segment_mm.h | |||
diff --git a/arch/m68knommu/include/asm/segment.h b/arch/m68k/include/asm/segment_no.h index 42318ebec7e..42318ebec7e 100644 --- a/arch/m68knommu/include/asm/segment.h +++ b/arch/m68k/include/asm/segment_no.h | |||
diff --git a/include/asm-m68k/sembuf.h b/arch/m68k/include/asm/sembuf.h index 2308052a8c2..2308052a8c2 100644 --- a/include/asm-m68k/sembuf.h +++ b/arch/m68k/include/asm/sembuf.h | |||
diff --git a/include/asm-m68k/serial.h b/arch/m68k/include/asm/serial.h index 2b90d6e6907..2b90d6e6907 100644 --- a/include/asm-m68k/serial.h +++ b/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 00000000000..842f86f75cc --- /dev/null +++ b/arch/m68k/include/asm/setup.h | |||
@@ -0,0 +1,5 @@ | |||
1 | #ifdef __uClinux__ | ||
2 | #include "setup_no.h" | ||
3 | #else | ||
4 | #include "setup_mm.h" | ||
5 | #endif | ||
diff --git a/include/asm-m68k/setup.h b/arch/m68k/include/asm/setup_mm.h index 4dfb3952b37..4dfb3952b37 100644 --- a/include/asm-m68k/setup.h +++ b/arch/m68k/include/asm/setup_mm.h | |||
diff --git a/arch/m68knommu/include/asm/setup.h b/arch/m68k/include/asm/setup_no.h index fb86bb2a607..45d286ce939 100644 --- a/arch/m68knommu/include/asm/setup.h +++ b/arch/m68k/include/asm/setup_no.h | |||
@@ -1,6 +1,6 @@ | |||
1 | #ifdef __KERNEL__ | 1 | #ifdef __KERNEL__ |
2 | 2 | ||
3 | #include <asm-m68k/setup.h> | 3 | #include <asm/setup_mm.h> |
4 | 4 | ||
5 | /* We have a bigger command line buffer. */ | 5 | /* We have a bigger command line buffer. */ |
6 | #undef COMMAND_LINE_SIZE | 6 | #undef COMMAND_LINE_SIZE |
diff --git a/include/asm-m68k/shm.h b/arch/m68k/include/asm/shm.h index fa56ec84a12..fa56ec84a12 100644 --- a/include/asm-m68k/shm.h +++ b/arch/m68k/include/asm/shm.h | |||
diff --git a/include/asm-m68k/shmbuf.h b/arch/m68k/include/asm/shmbuf.h index f8928d62f1b..f8928d62f1b 100644 --- a/include/asm-m68k/shmbuf.h +++ b/arch/m68k/include/asm/shmbuf.h | |||
diff --git a/include/asm-m68k/shmparam.h b/arch/m68k/include/asm/shmparam.h index 558892a2efb..558892a2efb 100644 --- a/include/asm-m68k/shmparam.h +++ b/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 00000000000..bff6d40345a --- /dev/null +++ b/arch/m68k/include/asm/sigcontext.h | |||
@@ -0,0 +1,5 @@ | |||
1 | #ifdef __uClinux__ | ||
2 | #include "sigcontext_no.h" | ||
3 | #else | ||
4 | #include "sigcontext_mm.h" | ||
5 | #endif | ||
diff --git a/include/asm-m68k/sigcontext.h b/arch/m68k/include/asm/sigcontext_mm.h index 64fbe34cf26..64fbe34cf26 100644 --- a/include/asm-m68k/sigcontext.h +++ b/arch/m68k/include/asm/sigcontext_mm.h | |||
diff --git a/arch/m68knommu/include/asm/sigcontext.h b/arch/m68k/include/asm/sigcontext_no.h index 36c293fc133..36c293fc133 100644 --- a/arch/m68knommu/include/asm/sigcontext.h +++ b/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 00000000000..61219d7affc --- /dev/null +++ b/arch/m68k/include/asm/siginfo.h | |||
@@ -0,0 +1,5 @@ | |||
1 | #ifdef __uClinux__ | ||
2 | #include "siginfo_no.h" | ||
3 | #else | ||
4 | #include "siginfo_mm.h" | ||
5 | #endif | ||
diff --git a/include/asm-m68k/siginfo.h b/arch/m68k/include/asm/siginfo_mm.h index 05a8d6d90b5..05a8d6d90b5 100644 --- a/include/asm-m68k/siginfo.h +++ b/arch/m68k/include/asm/siginfo_mm.h | |||
diff --git a/arch/m68knommu/include/asm/siginfo.h b/arch/m68k/include/asm/siginfo_no.h index b18e5f4064a..b18e5f4064a 100644 --- a/arch/m68knommu/include/asm/siginfo.h +++ b/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 00000000000..3c19988bd93 --- /dev/null +++ b/arch/m68k/include/asm/signal.h | |||
@@ -0,0 +1,5 @@ | |||
1 | #ifdef __uClinux__ | ||
2 | #include "signal_no.h" | ||
3 | #else | ||
4 | #include "signal_mm.h" | ||
5 | #endif | ||
diff --git a/include/asm-m68k/signal.h b/arch/m68k/include/asm/signal_mm.h index 3db8a81942f..3db8a81942f 100644 --- a/include/asm-m68k/signal.h +++ b/arch/m68k/include/asm/signal_mm.h | |||
diff --git a/arch/m68knommu/include/asm/signal.h b/arch/m68k/include/asm/signal_no.h index 216c08be54a..216c08be54a 100644 --- a/arch/m68knommu/include/asm/signal.h +++ b/arch/m68k/include/asm/signal_no.h | |||
diff --git a/arch/m68knommu/include/asm/smp.h b/arch/m68k/include/asm/smp.h index 9e9bd7e5892..9e9bd7e5892 100644 --- a/arch/m68knommu/include/asm/smp.h +++ b/arch/m68k/include/asm/smp.h | |||
diff --git a/include/asm-m68k/socket.h b/arch/m68k/include/asm/socket.h index dbc64e92c41..dbc64e92c41 100644 --- a/include/asm-m68k/socket.h +++ b/arch/m68k/include/asm/socket.h | |||
diff --git a/include/asm-m68k/sockios.h b/arch/m68k/include/asm/sockios.h index c04a23943cb..c04a23943cb 100644 --- a/include/asm-m68k/sockios.h +++ b/arch/m68k/include/asm/sockios.h | |||
diff --git a/include/asm-m68k/spinlock.h b/arch/m68k/include/asm/spinlock.h index 20f46e27b53..20f46e27b53 100644 --- a/include/asm-m68k/spinlock.h +++ b/arch/m68k/include/asm/spinlock.h | |||
diff --git a/include/asm-m68k/stat.h b/arch/m68k/include/asm/stat.h index dd38bc2e9f9..dd38bc2e9f9 100644 --- a/include/asm-m68k/stat.h +++ b/arch/m68k/include/asm/stat.h | |||
diff --git a/include/asm-m68k/statfs.h b/arch/m68k/include/asm/statfs.h index 08d93f14e06..08d93f14e06 100644 --- a/include/asm-m68k/statfs.h +++ b/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 00000000000..2c356f90f17 --- /dev/null +++ b/arch/m68k/include/asm/string.h | |||
@@ -0,0 +1,5 @@ | |||
1 | #ifdef __uClinux__ | ||
2 | #include "string_no.h" | ||
3 | #else | ||
4 | #include "string_mm.h" | ||
5 | #endif | ||
diff --git a/include/asm-m68k/string.h b/arch/m68k/include/asm/string_mm.h index 2eb7df1e0f5..2eb7df1e0f5 100644 --- a/include/asm-m68k/string.h +++ b/arch/m68k/include/asm/string_mm.h | |||
diff --git a/arch/m68knommu/include/asm/string.h b/arch/m68k/include/asm/string_no.h index af09e17000f..af09e17000f 100644 --- a/arch/m68knommu/include/asm/string.h +++ b/arch/m68k/include/asm/string_no.h | |||
diff --git a/include/asm-m68k/sun3-head.h b/arch/m68k/include/asm/sun3-head.h index 05af2f18b3b..05af2f18b3b 100644 --- a/include/asm-m68k/sun3-head.h +++ b/arch/m68k/include/asm/sun3-head.h | |||
diff --git a/include/asm-m68k/sun3_pgalloc.h b/arch/m68k/include/asm/sun3_pgalloc.h index d4c83f14381..d4c83f14381 100644 --- a/include/asm-m68k/sun3_pgalloc.h +++ b/arch/m68k/include/asm/sun3_pgalloc.h | |||
diff --git a/include/asm-m68k/sun3_pgtable.h b/arch/m68k/include/asm/sun3_pgtable.h index f847ec732d6..f847ec732d6 100644 --- a/include/asm-m68k/sun3_pgtable.h +++ b/arch/m68k/include/asm/sun3_pgtable.h | |||
diff --git a/include/asm-m68k/sun3ints.h b/arch/m68k/include/asm/sun3ints.h index 309d6e6a137..309d6e6a137 100644 --- a/include/asm-m68k/sun3ints.h +++ b/arch/m68k/include/asm/sun3ints.h | |||
diff --git a/include/asm-m68k/sun3mmu.h b/arch/m68k/include/asm/sun3mmu.h index d8f17a0d8c9..d8f17a0d8c9 100644 --- a/include/asm-m68k/sun3mmu.h +++ b/arch/m68k/include/asm/sun3mmu.h | |||
diff --git a/include/asm-m68k/sun3x.h b/arch/m68k/include/asm/sun3x.h index f5691a1ed7c..f5691a1ed7c 100644 --- a/include/asm-m68k/sun3x.h +++ b/arch/m68k/include/asm/sun3x.h | |||
diff --git a/include/asm-m68k/sun3xflop.h b/arch/m68k/include/asm/sun3xflop.h index 32c45f84ac6..32c45f84ac6 100644 --- a/include/asm-m68k/sun3xflop.h +++ b/arch/m68k/include/asm/sun3xflop.h | |||
diff --git a/include/asm-m68k/sun3xprom.h b/arch/m68k/include/asm/sun3xprom.h index 6735efcf5f6..6735efcf5f6 100644 --- a/include/asm-m68k/sun3xprom.h +++ b/arch/m68k/include/asm/sun3xprom.h | |||
diff --git a/include/asm-m68k/suspend.h b/arch/m68k/include/asm/suspend.h index 57b3ddb4d26..57b3ddb4d26 100644 --- a/include/asm-m68k/suspend.h +++ b/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 00000000000..e69de29bb2d --- /dev/null +++ b/arch/m68k/include/asm/swab.h | |||
diff --git a/include/asm-m68k/swab.h b/arch/m68k/include/asm/swab_mm.h index 7221e306682..7221e306682 100644 --- a/include/asm-m68k/swab.h +++ b/arch/m68k/include/asm/swab_mm.h | |||
diff --git a/arch/m68knommu/include/asm/swab.h b/arch/m68k/include/asm/swab_no.h index e582257db30..e582257db30 100644 --- a/arch/m68knommu/include/asm/swab.h +++ b/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 00000000000..ccea925ff4f --- /dev/null +++ b/arch/m68k/include/asm/system.h | |||
@@ -0,0 +1,5 @@ | |||
1 | #ifdef __uClinux__ | ||
2 | #include "system_no.h" | ||
3 | #else | ||
4 | #include "system_mm.h" | ||
5 | #endif | ||
diff --git a/include/asm-m68k/system.h b/arch/m68k/include/asm/system_mm.h index dbb6515ffd5..dbb6515ffd5 100644 --- a/include/asm-m68k/system.h +++ b/arch/m68k/include/asm/system_mm.h | |||
diff --git a/arch/m68knommu/include/asm/system.h b/arch/m68k/include/asm/system_no.h index 40f49de6982..40f49de6982 100644 --- a/arch/m68knommu/include/asm/system.h +++ b/arch/m68k/include/asm/system_no.h | |||
diff --git a/include/asm-m68k/termbits.h b/arch/m68k/include/asm/termbits.h index 8c14170996b..8c14170996b 100644 --- a/include/asm-m68k/termbits.h +++ b/arch/m68k/include/asm/termbits.h | |||
diff --git a/include/asm-m68k/termios.h b/arch/m68k/include/asm/termios.h index 0823032e404..0823032e404 100644 --- a/include/asm-m68k/termios.h +++ b/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 00000000000..f31a3f42b7b --- /dev/null +++ b/arch/m68k/include/asm/thread_info.h | |||
@@ -0,0 +1,5 @@ | |||
1 | #ifdef __uClinux__ | ||
2 | #include "thread_info_no.h" | ||
3 | #else | ||
4 | #include "thread_info_mm.h" | ||
5 | #endif | ||
diff --git a/include/asm-m68k/thread_info.h b/arch/m68k/include/asm/thread_info_mm.h index af0fda46e94..af0fda46e94 100644 --- a/include/asm-m68k/thread_info.h +++ b/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 index 82529f424ea..82529f424ea 100644 --- a/arch/m68knommu/include/asm/thread_info.h +++ b/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 00000000000..71976298057 --- /dev/null +++ b/arch/m68k/include/asm/timex.h | |||
@@ -0,0 +1,5 @@ | |||
1 | #ifdef __uClinux__ | ||
2 | #include "timex_no.h" | ||
3 | #else | ||
4 | #include "timex_mm.h" | ||
5 | #endif | ||
diff --git a/include/asm-m68k/timex.h b/arch/m68k/include/asm/timex_mm.h index b87f2f278f6..b87f2f278f6 100644 --- a/include/asm-m68k/timex.h +++ b/arch/m68k/include/asm/timex_mm.h | |||
diff --git a/arch/m68knommu/include/asm/timex.h b/arch/m68k/include/asm/timex_no.h index 109050f3fe9..109050f3fe9 100644 --- a/arch/m68knommu/include/asm/timex.h +++ b/arch/m68k/include/asm/timex_no.h | |||
diff --git a/include/asm-m68k/tlb.h b/arch/m68k/include/asm/tlb.h index 1785cff7344..1785cff7344 100644 --- a/include/asm-m68k/tlb.h +++ b/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 00000000000..b6f93b30951 --- /dev/null +++ b/arch/m68k/include/asm/tlbflush.h | |||
@@ -0,0 +1,5 @@ | |||
1 | #ifdef __uClinux__ | ||
2 | #include "tlbflush_no.h" | ||
3 | #else | ||
4 | #include "tlbflush_mm.h" | ||
5 | #endif | ||
diff --git a/include/asm-m68k/tlbflush.h b/arch/m68k/include/asm/tlbflush_mm.h index acb6bf21a32..acb6bf21a32 100644 --- a/include/asm-m68k/tlbflush.h +++ b/arch/m68k/include/asm/tlbflush_mm.h | |||
diff --git a/arch/m68knommu/include/asm/tlbflush.h b/arch/m68k/include/asm/tlbflush_no.h index a470cfb803e..a470cfb803e 100644 --- a/arch/m68knommu/include/asm/tlbflush.h +++ b/arch/m68k/include/asm/tlbflush_no.h | |||
diff --git a/arch/m68knommu/include/asm/topology.h b/arch/m68k/include/asm/topology.h index ca173e9f26f..ca173e9f26f 100644 --- a/arch/m68knommu/include/asm/topology.h +++ b/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 00000000000..3011ec0f536 --- /dev/null +++ b/arch/m68k/include/asm/traps.h | |||
@@ -0,0 +1,5 @@ | |||
1 | #ifdef __uClinux__ | ||
2 | #include "traps_no.h" | ||
3 | #else | ||
4 | #include "traps_mm.h" | ||
5 | #endif | ||
diff --git a/include/asm-m68k/traps.h b/arch/m68k/include/asm/traps_mm.h index 8caef25624c..8caef25624c 100644 --- a/include/asm-m68k/traps.h +++ b/arch/m68k/include/asm/traps_mm.h | |||
diff --git a/arch/m68knommu/include/asm/traps.h b/arch/m68k/include/asm/traps_no.h index d0671e5f8e2..d0671e5f8e2 100644 --- a/arch/m68knommu/include/asm/traps.h +++ b/arch/m68k/include/asm/traps_no.h | |||
diff --git a/include/asm-m68k/types.h b/arch/m68k/include/asm/types.h index 6441cb5f8e7..6441cb5f8e7 100644 --- a/include/asm-m68k/types.h +++ b/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 00000000000..38f92dbb9a4 --- /dev/null +++ b/arch/m68k/include/asm/uaccess.h | |||
@@ -0,0 +1,5 @@ | |||
1 | #ifdef __uClinux__ | ||
2 | #include "uaccess_no.h" | ||
3 | #else | ||
4 | #include "uaccess_mm.h" | ||
5 | #endif | ||
diff --git a/include/asm-m68k/uaccess.h b/arch/m68k/include/asm/uaccess_mm.h index 7107f3fbdbb..7107f3fbdbb 100644 --- a/include/asm-m68k/uaccess.h +++ b/arch/m68k/include/asm/uaccess_mm.h | |||
diff --git a/arch/m68knommu/include/asm/uaccess.h b/arch/m68k/include/asm/uaccess_no.h index 68bbe9b312f..68bbe9b312f 100644 --- a/arch/m68knommu/include/asm/uaccess.h +++ b/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 00000000000..b53cd160c0b --- /dev/null +++ b/arch/m68k/include/asm/ucontext.h | |||
@@ -0,0 +1,5 @@ | |||
1 | #ifdef __uClinux__ | ||
2 | #include "ucontext_no.h" | ||
3 | #else | ||
4 | #include "ucontext_mm.h" | ||
5 | #endif | ||
diff --git a/include/asm-m68k/ucontext.h b/arch/m68k/include/asm/ucontext_mm.h index e4e22669edc..e4e22669edc 100644 --- a/include/asm-m68k/ucontext.h +++ b/arch/m68k/include/asm/ucontext_mm.h | |||
diff --git a/arch/m68knommu/include/asm/ucontext.h b/arch/m68k/include/asm/ucontext_no.h index 713a27f901c..713a27f901c 100644 --- a/arch/m68knommu/include/asm/ucontext.h +++ b/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 00000000000..c640bba3bdf --- /dev/null +++ b/arch/m68k/include/asm/unaligned.h | |||
@@ -0,0 +1,5 @@ | |||
1 | #ifdef __uClinux__ | ||
2 | #include "unaligned_no.h" | ||
3 | #else | ||
4 | #include "unaligned_mm.h" | ||
5 | #endif | ||
diff --git a/include/asm-m68k/unaligned.h b/arch/m68k/include/asm/unaligned_mm.h index 77698f2dc33..77698f2dc33 100644 --- a/include/asm-m68k/unaligned.h +++ b/arch/m68k/include/asm/unaligned_mm.h | |||
diff --git a/arch/m68knommu/include/asm/unaligned.h b/arch/m68k/include/asm/unaligned_no.h index eb1ea4cb9a5..eb1ea4cb9a5 100644 --- a/arch/m68knommu/include/asm/unaligned.h +++ b/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 00000000000..df1d9d4cb1f --- /dev/null +++ b/arch/m68k/include/asm/unistd.h | |||
@@ -0,0 +1,5 @@ | |||
1 | #ifdef __uClinux__ | ||
2 | #include "unistd_no.h" | ||
3 | #else | ||
4 | #include "unistd_mm.h" | ||
5 | #endif | ||
diff --git a/include/asm-m68k/unistd.h b/arch/m68k/include/asm/unistd_mm.h index 965abb8bc7f..965abb8bc7f 100644 --- a/include/asm-m68k/unistd.h +++ b/arch/m68k/include/asm/unistd_mm.h | |||
diff --git a/arch/m68knommu/include/asm/unistd.h b/arch/m68k/include/asm/unistd_no.h index b034a2f7b44..b034a2f7b44 100644 --- a/arch/m68knommu/include/asm/unistd.h +++ b/arch/m68k/include/asm/unistd_no.h | |||
diff --git a/include/asm-m68k/user.h b/arch/m68k/include/asm/user.h index f1f478d6e05..f1f478d6e05 100644 --- a/include/asm-m68k/user.h +++ b/arch/m68k/include/asm/user.h | |||
diff --git a/include/asm-m68k/virtconvert.h b/arch/m68k/include/asm/virtconvert.h index 22ab05c9c52..22ab05c9c52 100644 --- a/include/asm-m68k/virtconvert.h +++ b/arch/m68k/include/asm/virtconvert.h | |||
diff --git a/include/asm-m68k/xor.h b/arch/m68k/include/asm/xor.h index c82eb12a5b1..c82eb12a5b1 100644 --- a/include/asm-m68k/xor.h +++ b/arch/m68k/include/asm/xor.h | |||
diff --git a/include/asm-m68k/zorro.h b/arch/m68k/include/asm/zorro.h index 5ce97c22b58..5ce97c22b58 100644 --- a/include/asm-m68k/zorro.h +++ b/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 58c02a45413..00000000000 --- a/arch/m68knommu/include/asm/Kbuild +++ /dev/null | |||
@@ -1,3 +0,0 @@ | |||
1 | include include/asm-generic/Kbuild.asm | ||
2 | |||
3 | unifdef-y += swab.h | ||
diff --git a/arch/m68knommu/include/asm/cachectl.h b/arch/m68knommu/include/asm/cachectl.h deleted file mode 100644 index bcf5a6a9dd5..00000000000 --- a/arch/m68knommu/include/asm/cachectl.h +++ /dev/null | |||
@@ -1 +0,0 @@ | |||
1 | #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 a0c4a660878..00000000000 --- a/arch/m68knommu/include/asm/cputime.h +++ /dev/null | |||
@@ -1,6 +0,0 @@ | |||
1 | #ifndef __M68KNOMMU_CPUTIME_H | ||
2 | #define __M68KNOMMU_CPUTIME_H | ||
3 | |||
4 | #include <asm-generic/cputime.h> | ||
5 | |||
6 | #endif /* __M68KNOMMU_CPUTIME_H */ | ||
diff --git a/arch/m68knommu/include/asm/errno.h b/arch/m68knommu/include/asm/errno.h deleted file mode 100644 index 7e8c22b9a5e..00000000000 --- a/arch/m68knommu/include/asm/errno.h +++ /dev/null | |||
@@ -1 +0,0 @@ | |||
1 | #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 f6a552cda4c..00000000000 --- a/arch/m68knommu/include/asm/fcntl.h +++ /dev/null | |||
@@ -1 +0,0 @@ | |||
1 | #include <asm-m68k/fcntl.h> | ||
diff --git a/arch/m68knommu/include/asm/hwtest.h b/arch/m68knommu/include/asm/hwtest.h deleted file mode 100644 index 700626a1b1b..00000000000 --- a/arch/m68knommu/include/asm/hwtest.h +++ /dev/null | |||
@@ -1 +0,0 @@ | |||
1 | #include <asm-m68k/hwtest.h> | ||
diff --git a/arch/m68knommu/include/asm/ioctls.h b/arch/m68knommu/include/asm/ioctls.h deleted file mode 100644 index 0b1eb4d8505..00000000000 --- a/arch/m68knommu/include/asm/ioctls.h +++ /dev/null | |||
@@ -1 +0,0 @@ | |||
1 | #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 e4a7be6dd70..00000000000 --- a/arch/m68knommu/include/asm/ipcbuf.h +++ /dev/null | |||
@@ -1 +0,0 @@ | |||
1 | #include <asm-m68k/ipcbuf.h> | ||
diff --git a/arch/m68knommu/include/asm/linkage.h b/arch/m68knommu/include/asm/linkage.h deleted file mode 100644 index c288a19ff48..00000000000 --- a/arch/m68knommu/include/asm/linkage.h +++ /dev/null | |||
@@ -1 +0,0 @@ | |||
1 | #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 84a39c1b86f..00000000000 --- a/arch/m68knommu/include/asm/local.h +++ /dev/null | |||
@@ -1,6 +0,0 @@ | |||
1 | #ifndef __M68KNOMMU_LOCAL_H | ||
2 | #define __M68KNOMMU_LOCAL_H | ||
3 | |||
4 | #include <asm-generic/local.h> | ||
5 | |||
6 | #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 7e7090517b7..00000000000 --- a/arch/m68knommu/include/asm/math-emu.h +++ /dev/null | |||
@@ -1 +0,0 @@ | |||
1 | #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 d810c78de5f..00000000000 --- a/arch/m68knommu/include/asm/md.h +++ /dev/null | |||
@@ -1 +0,0 @@ | |||
1 | #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 4846c682efe..00000000000 --- a/arch/m68knommu/include/asm/mman.h +++ /dev/null | |||
@@ -1 +0,0 @@ | |||
1 | #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 81a16779e83..00000000000 --- a/arch/m68knommu/include/asm/movs.h +++ /dev/null | |||
@@ -1 +0,0 @@ | |||
1 | #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 bdfadec4d52..00000000000 --- a/arch/m68knommu/include/asm/msgbuf.h +++ /dev/null | |||
@@ -1 +0,0 @@ | |||
1 | #include <asm-m68k/msgbuf.h> | ||
diff --git a/arch/m68knommu/include/asm/openprom.h b/arch/m68knommu/include/asm/openprom.h deleted file mode 100644 index fdba7953ff9..00000000000 --- a/arch/m68knommu/include/asm/openprom.h +++ /dev/null | |||
@@ -1 +0,0 @@ | |||
1 | #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 ce079dc332d..00000000000 --- a/arch/m68knommu/include/asm/oplib.h +++ /dev/null | |||
@@ -1 +0,0 @@ | |||
1 | #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 5de72c327ef..00000000000 --- a/arch/m68knommu/include/asm/percpu.h +++ /dev/null | |||
@@ -1,6 +0,0 @@ | |||
1 | #ifndef __ARCH_M68KNOMMU_PERCPU__ | ||
2 | #define __ARCH_M68KNOMMU_PERCPU__ | ||
3 | |||
4 | #include <asm-generic/percpu.h> | ||
5 | |||
6 | #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 ee1b6cb549c..00000000000 --- a/arch/m68knommu/include/asm/poll.h +++ /dev/null | |||
@@ -1 +0,0 @@ | |||
1 | #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 6205fb9392a..00000000000 --- a/arch/m68knommu/include/asm/posix_types.h +++ /dev/null | |||
@@ -1 +0,0 @@ | |||
1 | #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 7fa63d5ea57..00000000000 --- a/arch/m68knommu/include/asm/resource.h +++ /dev/null | |||
@@ -1 +0,0 @@ | |||
1 | #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 eaf18ec83c8..00000000000 --- a/arch/m68knommu/include/asm/rtc.h +++ /dev/null | |||
@@ -1 +0,0 @@ | |||
1 | #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 dd0ecb98ec0..00000000000 --- a/arch/m68knommu/include/asm/sections.h +++ /dev/null | |||
@@ -1,7 +0,0 @@ | |||
1 | #ifndef _M68KNOMMU_SECTIONS_H | ||
2 | #define _M68KNOMMU_SECTIONS_H | ||
3 | |||
4 | /* nothing to see, move along */ | ||
5 | #include <asm-generic/sections.h> | ||
6 | |||
7 | #endif | ||
diff --git a/arch/m68knommu/include/asm/sembuf.h b/arch/m68knommu/include/asm/sembuf.h deleted file mode 100644 index 3a634f9ecf5..00000000000 --- a/arch/m68knommu/include/asm/sembuf.h +++ /dev/null | |||
@@ -1 +0,0 @@ | |||
1 | #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 cc8e522d905..00000000000 --- a/arch/m68knommu/include/asm/shm.h +++ /dev/null | |||
@@ -1 +0,0 @@ | |||
1 | #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 bc34cf8eefc..00000000000 --- a/arch/m68knommu/include/asm/shmbuf.h +++ /dev/null | |||
@@ -1 +0,0 @@ | |||
1 | #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 d7ee69648eb..00000000000 --- a/arch/m68knommu/include/asm/shmparam.h +++ /dev/null | |||
@@ -1 +0,0 @@ | |||
1 | #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 ac5478bf637..00000000000 --- a/arch/m68knommu/include/asm/socket.h +++ /dev/null | |||
@@ -1 +0,0 @@ | |||
1 | #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 dcc6a8900ce..00000000000 --- a/arch/m68knommu/include/asm/sockios.h +++ /dev/null | |||
@@ -1 +0,0 @@ | |||
1 | #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 6bb1f06c478..00000000000 --- a/arch/m68knommu/include/asm/spinlock.h +++ /dev/null | |||
@@ -1 +0,0 @@ | |||
1 | #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 3d4b260e7c0..00000000000 --- a/arch/m68knommu/include/asm/stat.h +++ /dev/null | |||
@@ -1 +0,0 @@ | |||
1 | #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 2ce99eaf097..00000000000 --- a/arch/m68knommu/include/asm/statfs.h +++ /dev/null | |||
@@ -1 +0,0 @@ | |||
1 | #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 05dd6bc2728..00000000000 --- a/arch/m68knommu/include/asm/termbits.h +++ /dev/null | |||
@@ -1 +0,0 @@ | |||
1 | #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 e7337881a98..00000000000 --- a/arch/m68knommu/include/asm/termios.h +++ /dev/null | |||
@@ -1 +0,0 @@ | |||
1 | #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 77a7c51ca29..00000000000 --- a/arch/m68knommu/include/asm/tlb.h +++ /dev/null | |||
@@ -1 +0,0 @@ | |||
1 | #include <asm-m68k/tlb.h> | ||
diff --git a/arch/m68knommu/include/asm/types.h b/arch/m68knommu/include/asm/types.h deleted file mode 100644 index 031238c2d18..00000000000 --- a/arch/m68knommu/include/asm/types.h +++ /dev/null | |||
@@ -1 +0,0 @@ | |||
1 | #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 a5a555b761c..00000000000 --- a/arch/m68knommu/include/asm/user.h +++ /dev/null | |||
@@ -1 +0,0 @@ | |||
1 | #include <asm-m68k/user.h> | ||
diff --git a/include/asm-m68k/auxvec.h b/include/asm-m68k/auxvec.h deleted file mode 100644 index 844d6d52204..00000000000 --- a/include/asm-m68k/auxvec.h +++ /dev/null | |||
@@ -1,4 +0,0 @@ | |||
1 | #ifndef __ASMm68k_AUXVEC_H | ||
2 | #define __ASMm68k_AUXVEC_H | ||
3 | |||
4 | #endif | ||
diff --git a/include/asm-m68k/device.h b/include/asm-m68k/device.h deleted file mode 100644 index d8f9872b0e2..00000000000 --- a/include/asm-m68k/device.h +++ /dev/null | |||
@@ -1,7 +0,0 @@ | |||
1 | /* | ||
2 | * Arch specific extensions to struct device | ||
3 | * | ||
4 | * This file is released under the GPLv2 | ||
5 | */ | ||
6 | #include <asm-generic/device.h> | ||
7 | |||
diff --git a/include/asm-m68k/emergency-restart.h b/include/asm-m68k/emergency-restart.h deleted file mode 100644 index 108d8c48e42..00000000000 --- a/include/asm-m68k/emergency-restart.h +++ /dev/null | |||
@@ -1,6 +0,0 @@ | |||
1 | #ifndef _ASM_EMERGENCY_RESTART_H | ||
2 | #define _ASM_EMERGENCY_RESTART_H | ||
3 | |||
4 | #include <asm-generic/emergency-restart.h> | ||
5 | |||
6 | #endif /* _ASM_EMERGENCY_RESTART_H */ | ||
diff --git a/include/asm-m68k/futex.h b/include/asm-m68k/futex.h deleted file mode 100644 index 6a332a9f099..00000000000 --- a/include/asm-m68k/futex.h +++ /dev/null | |||
@@ -1,6 +0,0 @@ | |||
1 | #ifndef _ASM_FUTEX_H | ||
2 | #define _ASM_FUTEX_H | ||
3 | |||
4 | #include <asm-generic/futex.h> | ||
5 | |||
6 | #endif | ||
diff --git a/include/asm-m68k/ioctl.h b/include/asm-m68k/ioctl.h deleted file mode 100644 index b279fe06dfe..00000000000 --- a/include/asm-m68k/ioctl.h +++ /dev/null | |||
@@ -1 +0,0 @@ | |||
1 | #include <asm-generic/ioctl.h> | ||
diff --git a/include/asm-m68k/irq_regs.h b/include/asm-m68k/irq_regs.h deleted file mode 100644 index 3dd9c0b7027..00000000000 --- a/include/asm-m68k/irq_regs.h +++ /dev/null | |||
@@ -1 +0,0 @@ | |||
1 | #include <asm-generic/irq_regs.h> | ||
diff --git a/include/asm-m68k/kdebug.h b/include/asm-m68k/kdebug.h deleted file mode 100644 index 6ece1b03766..00000000000 --- a/include/asm-m68k/kdebug.h +++ /dev/null | |||
@@ -1 +0,0 @@ | |||
1 | #include <asm-generic/kdebug.h> | ||
diff --git a/include/asm-m68k/mutex.h b/include/asm-m68k/mutex.h deleted file mode 100644 index 458c1f7fbc1..00000000000 --- a/include/asm-m68k/mutex.h +++ /dev/null | |||
@@ -1,9 +0,0 @@ | |||
1 | /* | ||
2 | * Pull in the generic implementation for the mutex fastpath. | ||
3 | * | ||
4 | * TODO: implement optimized primitives instead, or leave the generic | ||
5 | * implementation in place, or pick the atomic_xchg() based generic | ||
6 | * implementation. (see asm-generic/mutex-xchg.h for details) | ||
7 | */ | ||
8 | |||
9 | #include <asm-generic/mutex-dec.h> | ||
diff --git a/include/asm-m68k/topology.h b/include/asm-m68k/topology.h deleted file mode 100644 index ca173e9f26f..00000000000 --- a/include/asm-m68k/topology.h +++ /dev/null | |||
@@ -1,6 +0,0 @@ | |||
1 | #ifndef _ASM_M68K_TOPOLOGY_H | ||
2 | #define _ASM_M68K_TOPOLOGY_H | ||
3 | |||
4 | #include <asm-generic/topology.h> | ||
5 | |||
6 | #endif /* _ASM_M68K_TOPOLOGY_H */ | ||