]> pilppa.com Git - linux-2.6-omap-h63xx.git/commitdiff
sparc, sparc64: use arch/sparc/include
authorSam Ravnborg <sam@ravnborg.org>
Sun, 27 Jul 2008 21:00:59 +0000 (23:00 +0200)
committerSam Ravnborg <sam@ravnborg.org>
Sun, 27 Jul 2008 21:00:59 +0000 (23:00 +0200)
The majority of this patch was created by the following script:

***
ASM=arch/sparc/include/asm
mkdir -p $ASM
git mv include/asm-sparc64/ftrace.h $ASM
git rm include/asm-sparc64/*
git mv include/asm-sparc/* $ASM
sed -ie 's/asm-sparc64/asm/g' $ASM/*
sed -ie 's/asm-sparc/asm/g' $ASM/*
***

The rest was an update of the top-level Makefile to use sparc
for header files when sparc64 is being build.
And a small fixlet to pick up the correct unistd.h from
sparc64 code.

Signed-off-by: Sam Ravnborg <sam@ravnborg.org>
492 files changed:
Makefile
arch/sparc/include/asm/Kbuild [moved from include/asm-sparc/Kbuild with 100% similarity]
arch/sparc/include/asm/agp.h [moved from include/asm-sparc/agp.h with 100% similarity]
arch/sparc/include/asm/apb.h [moved from include/asm-sparc/apb.h with 100% similarity]
arch/sparc/include/asm/apc.h [moved from include/asm-sparc/apc.h with 100% similarity]
arch/sparc/include/asm/asi.h [moved from include/asm-sparc/asi.h with 100% similarity]
arch/sparc/include/asm/asmmacro.h [moved from include/asm-sparc/asmmacro.h with 100% similarity]
arch/sparc/include/asm/atomic.h [moved from include/asm-sparc/atomic.h with 65% similarity]
arch/sparc/include/asm/atomic_32.h [moved from include/asm-sparc/atomic_32.h with 100% similarity]
arch/sparc/include/asm/atomic_64.h [moved from include/asm-sparc/atomic_64.h with 100% similarity]
arch/sparc/include/asm/auxio.h [moved from include/asm-sparc/auxio.h with 65% similarity]
arch/sparc/include/asm/auxio_32.h [moved from include/asm-sparc/auxio_32.h with 97% similarity]
arch/sparc/include/asm/auxio_64.h [moved from include/asm-sparc/auxio_64.h with 100% similarity]
arch/sparc/include/asm/auxvec.h [moved from include/asm-sparc/auxvec.h with 100% similarity]
arch/sparc/include/asm/backoff.h [moved from include/asm-sparc/backoff.h with 100% similarity]
arch/sparc/include/asm/bbc.h [moved from include/asm-sparc/bbc.h with 100% similarity]
arch/sparc/include/asm/bitext.h [moved from include/asm-sparc/bitext.h with 100% similarity]
arch/sparc/include/asm/bitops.h [moved from include/asm-sparc/bitops.h with 65% similarity]
arch/sparc/include/asm/bitops_32.h [moved from include/asm-sparc/bitops_32.h with 100% similarity]
arch/sparc/include/asm/bitops_64.h [moved from include/asm-sparc/bitops_64.h with 100% similarity]
arch/sparc/include/asm/bpp.h [moved from include/asm-sparc/bpp.h with 100% similarity]
arch/sparc/include/asm/btfixup.h [moved from include/asm-sparc/btfixup.h with 99% similarity]
arch/sparc/include/asm/bug.h [moved from include/asm-sparc/bug.h with 100% similarity]
arch/sparc/include/asm/bugs.h [moved from include/asm-sparc/bugs.h with 87% similarity]
arch/sparc/include/asm/byteorder.h [moved from include/asm-sparc/byteorder.h with 100% similarity]
arch/sparc/include/asm/cache.h [moved from include/asm-sparc/cache.h with 100% similarity]
arch/sparc/include/asm/cacheflush.h [moved from include/asm-sparc/cacheflush.h with 64% similarity]
arch/sparc/include/asm/cacheflush_32.h [moved from include/asm-sparc/cacheflush_32.h with 100% similarity]
arch/sparc/include/asm/cacheflush_64.h [moved from include/asm-sparc/cacheflush_64.h with 100% similarity]
arch/sparc/include/asm/chafsr.h [moved from include/asm-sparc/chafsr.h with 100% similarity]
arch/sparc/include/asm/checksum.h [moved from include/asm-sparc/checksum.h with 65% similarity]
arch/sparc/include/asm/checksum_32.h [moved from include/asm-sparc/checksum_32.h with 100% similarity]
arch/sparc/include/asm/checksum_64.h [moved from include/asm-sparc/checksum_64.h with 100% similarity]
arch/sparc/include/asm/chmctrl.h [moved from include/asm-sparc/chmctrl.h with 100% similarity]
arch/sparc/include/asm/clock.h [moved from include/asm-sparc/clock.h with 100% similarity]
arch/sparc/include/asm/cmt.h [moved from include/asm-sparc/cmt.h with 100% similarity]
arch/sparc/include/asm/compat.h [moved from include/asm-sparc/compat.h with 100% similarity]
arch/sparc/include/asm/compat_signal.h [moved from include/asm-sparc/compat_signal.h with 100% similarity]
arch/sparc/include/asm/contregs.h [moved from include/asm-sparc/contregs.h with 100% similarity]
arch/sparc/include/asm/cpudata.h [moved from include/asm-sparc/cpudata.h with 65% similarity]
arch/sparc/include/asm/cpudata_32.h [moved from include/asm-sparc/cpudata_32.h with 89% similarity]
arch/sparc/include/asm/cpudata_64.h [moved from include/asm-sparc/cpudata_64.h with 100% similarity]
arch/sparc/include/asm/cputime.h [moved from include/asm-sparc/cputime.h with 100% similarity]
arch/sparc/include/asm/current.h [moved from include/asm-sparc/current.h with 96% similarity]
arch/sparc/include/asm/cypress.h [moved from include/asm-sparc/cypress.h with 100% similarity]
arch/sparc/include/asm/dcr.h [moved from include/asm-sparc/dcr.h with 100% similarity]
arch/sparc/include/asm/dcu.h [moved from include/asm-sparc/dcu.h with 100% similarity]
arch/sparc/include/asm/delay.h [moved from include/asm-sparc/delay.h with 65% similarity]
arch/sparc/include/asm/delay_32.h [moved from include/asm-sparc/delay_32.h with 100% similarity]
arch/sparc/include/asm/delay_64.h [moved from include/asm-sparc/delay_64.h with 100% similarity]
arch/sparc/include/asm/device.h [moved from include/asm-sparc/device.h with 100% similarity]
arch/sparc/include/asm/display7seg.h [moved from include/asm-sparc/display7seg.h with 100% similarity]
arch/sparc/include/asm/div64.h [moved from include/asm-sparc/div64.h with 100% similarity]
arch/sparc/include/asm/dma-mapping.h [moved from include/asm-sparc/dma-mapping.h with 64% similarity]
arch/sparc/include/asm/dma-mapping_32.h [moved from include/asm-sparc/dma-mapping_32.h with 100% similarity]
arch/sparc/include/asm/dma-mapping_64.h [moved from include/asm-sparc/dma-mapping_64.h with 100% similarity]
arch/sparc/include/asm/dma.h [moved from include/asm-sparc/dma.h with 66% similarity]
arch/sparc/include/asm/dma_32.h [moved from include/asm-sparc/dma_32.h with 99% similarity]
arch/sparc/include/asm/dma_64.h [moved from include/asm-sparc/dma_64.h with 99% similarity]
arch/sparc/include/asm/ebus.h [moved from include/asm-sparc/ebus.h with 66% similarity]
arch/sparc/include/asm/ebus_32.h [moved from include/asm-sparc/ebus_32.h with 100% similarity]
arch/sparc/include/asm/ebus_64.h [moved from include/asm-sparc/ebus_64.h with 100% similarity]
arch/sparc/include/asm/ecc.h [moved from include/asm-sparc/ecc.h with 100% similarity]
arch/sparc/include/asm/eeprom.h [moved from include/asm-sparc/eeprom.h with 100% similarity]
arch/sparc/include/asm/elf.h [moved from include/asm-sparc/elf.h with 66% similarity]
arch/sparc/include/asm/elf_32.h [moved from include/asm-sparc/elf_32.h with 100% similarity]
arch/sparc/include/asm/elf_64.h [moved from include/asm-sparc/elf_64.h with 100% similarity]
arch/sparc/include/asm/emergency-restart.h [moved from include/asm-sparc/emergency-restart.h with 100% similarity]
arch/sparc/include/asm/envctrl.h [moved from include/asm-sparc/envctrl.h with 100% similarity]
arch/sparc/include/asm/errno.h [moved from include/asm-sparc/errno.h with 100% similarity]
arch/sparc/include/asm/estate.h [moved from include/asm-sparc/estate.h with 100% similarity]
arch/sparc/include/asm/fb.h [moved from include/asm-sparc/fb.h with 100% similarity]
arch/sparc/include/asm/fbio.h [moved from include/asm-sparc/fbio.h with 100% similarity]
arch/sparc/include/asm/fcntl.h [moved from include/asm-sparc/fcntl.h with 100% similarity]
arch/sparc/include/asm/fhc.h [moved from include/asm-sparc/fhc.h with 100% similarity]
arch/sparc/include/asm/fixmap.h [moved from include/asm-sparc/fixmap.h with 100% similarity]
arch/sparc/include/asm/floppy.h [moved from include/asm-sparc/floppy.h with 65% similarity]
arch/sparc/include/asm/floppy_32.h [moved from include/asm-sparc/floppy_32.h with 99% similarity]
arch/sparc/include/asm/floppy_64.h [moved from include/asm-sparc/floppy_64.h with 100% similarity]
arch/sparc/include/asm/fpumacro.h [moved from include/asm-sparc/fpumacro.h with 100% similarity]
arch/sparc/include/asm/ftrace.h [moved from include/asm-sparc64/ftrace.h with 100% similarity]
arch/sparc/include/asm/futex.h [moved from include/asm-sparc/futex.h with 65% similarity]
arch/sparc/include/asm/futex_32.h [moved from include/asm-sparc/futex_32.h with 100% similarity]
arch/sparc/include/asm/futex_64.h [moved from include/asm-sparc/futex_64.h with 100% similarity]
arch/sparc/include/asm/hardirq.h [moved from include/asm-sparc/hardirq.h with 65% similarity]
arch/sparc/include/asm/hardirq_32.h [moved from include/asm-sparc/hardirq_32.h with 100% similarity]
arch/sparc/include/asm/hardirq_64.h [moved from include/asm-sparc/hardirq_64.h with 100% similarity]
arch/sparc/include/asm/head.h [moved from include/asm-sparc/head.h with 66% similarity]
arch/sparc/include/asm/head_32.h [moved from include/asm-sparc/head_32.h with 100% similarity]
arch/sparc/include/asm/head_64.h [moved from include/asm-sparc/head_64.h with 100% similarity]
arch/sparc/include/asm/highmem.h [moved from include/asm-sparc/highmem.h with 100% similarity]
arch/sparc/include/asm/hugetlb.h [moved from include/asm-sparc/hugetlb.h with 100% similarity]
arch/sparc/include/asm/hvtramp.h [moved from include/asm-sparc/hvtramp.h with 100% similarity]
arch/sparc/include/asm/hw_irq.h [moved from include/asm-sparc/hw_irq.h with 100% similarity]
arch/sparc/include/asm/hypervisor.h [moved from include/asm-sparc/hypervisor.h with 100% similarity]
arch/sparc/include/asm/ide.h [moved from include/asm-sparc/ide.h with 100% similarity]
arch/sparc/include/asm/idprom.h [moved from include/asm-sparc/idprom.h with 100% similarity]
arch/sparc/include/asm/intr_queue.h [moved from include/asm-sparc/intr_queue.h with 100% similarity]
arch/sparc/include/asm/io-unit.h [moved from include/asm-sparc/io-unit.h with 100% similarity]
arch/sparc/include/asm/io.h [moved from include/asm-sparc/io.h with 67% similarity]
arch/sparc/include/asm/io_32.h [moved from include/asm-sparc/io_32.h with 100% similarity]
arch/sparc/include/asm/io_64.h [moved from include/asm-sparc/io_64.h with 100% similarity]
arch/sparc/include/asm/ioctl.h [moved from include/asm-sparc/ioctl.h with 100% similarity]
arch/sparc/include/asm/ioctls.h [moved from include/asm-sparc/ioctls.h with 100% similarity]
arch/sparc/include/asm/iommu.h [moved from include/asm-sparc/iommu.h with 65% similarity]
arch/sparc/include/asm/iommu_32.h [moved from include/asm-sparc/iommu_32.h with 100% similarity]
arch/sparc/include/asm/iommu_64.h [moved from include/asm-sparc/iommu_64.h with 100% similarity]
arch/sparc/include/asm/ipcbuf.h [moved from include/asm-sparc/ipcbuf.h with 65% similarity]
arch/sparc/include/asm/ipcbuf_32.h [moved from include/asm-sparc/ipcbuf_32.h with 100% similarity]
arch/sparc/include/asm/ipcbuf_64.h [moved from include/asm-sparc/ipcbuf_64.h with 100% similarity]
arch/sparc/include/asm/irq.h [moved from include/asm-sparc/irq.h with 66% similarity]
arch/sparc/include/asm/irq_32.h [moved from include/asm-sparc/irq_32.h with 100% similarity]
arch/sparc/include/asm/irq_64.h [moved from include/asm-sparc/irq_64.h with 100% similarity]
arch/sparc/include/asm/irq_regs.h [moved from include/asm-sparc/irq_regs.h with 100% similarity]
arch/sparc/include/asm/irqflags.h [moved from include/asm-sparc/irqflags.h with 65% similarity]
arch/sparc/include/asm/irqflags_32.h [moved from include/asm-sparc/irqflags_32.h with 96% similarity]
arch/sparc/include/asm/irqflags_64.h [moved from include/asm-sparc/irqflags_64.h with 97% similarity]
arch/sparc/include/asm/jsflash.h [moved from include/asm-sparc/jsflash.h with 100% similarity]
arch/sparc/include/asm/kdebug.h [moved from include/asm-sparc/kdebug.h with 65% similarity]
arch/sparc/include/asm/kdebug_32.h [moved from include/asm-sparc/kdebug_32.h with 100% similarity]
arch/sparc/include/asm/kdebug_64.h [moved from include/asm-sparc/kdebug_64.h with 100% similarity]
arch/sparc/include/asm/kgdb.h [moved from include/asm-sparc/kgdb.h with 100% similarity]
arch/sparc/include/asm/kmap_types.h [moved from include/asm-sparc/kmap_types.h with 100% similarity]
arch/sparc/include/asm/kprobes.h [moved from include/asm-sparc/kprobes.h with 100% similarity]
arch/sparc/include/asm/ldc.h [moved from include/asm-sparc/ldc.h with 100% similarity]
arch/sparc/include/asm/linkage.h [moved from include/asm-sparc/linkage.h with 100% similarity]
arch/sparc/include/asm/lmb.h [moved from include/asm-sparc/lmb.h with 100% similarity]
arch/sparc/include/asm/local.h [moved from include/asm-sparc/local.h with 100% similarity]
arch/sparc/include/asm/lsu.h [moved from include/asm-sparc/lsu.h with 100% similarity]
arch/sparc/include/asm/machines.h [moved from include/asm-sparc/machines.h with 100% similarity]
arch/sparc/include/asm/mbus.h [moved from include/asm-sparc/mbus.h with 100% similarity]
arch/sparc/include/asm/mc146818rtc.h [moved from include/asm-sparc/mc146818rtc.h with 64% similarity]
arch/sparc/include/asm/mc146818rtc_32.h [moved from include/asm-sparc/mc146818rtc_32.h with 100% similarity]
arch/sparc/include/asm/mc146818rtc_64.h [moved from include/asm-sparc/mc146818rtc_64.h with 100% similarity]
arch/sparc/include/asm/mdesc.h [moved from include/asm-sparc/mdesc.h with 100% similarity]
arch/sparc/include/asm/memreg.h [moved from include/asm-sparc/memreg.h with 100% similarity]
arch/sparc/include/asm/mman.h [moved from include/asm-sparc/mman.h with 100% similarity]
arch/sparc/include/asm/mmu.h [moved from include/asm-sparc/mmu.h with 66% similarity]
arch/sparc/include/asm/mmu_32.h [moved from include/asm-sparc/mmu_32.h with 100% similarity]
arch/sparc/include/asm/mmu_64.h [moved from include/asm-sparc/mmu_64.h with 100% similarity]
arch/sparc/include/asm/mmu_context.h [moved from include/asm-sparc/mmu_context.h with 64% similarity]
arch/sparc/include/asm/mmu_context_32.h [moved from include/asm-sparc/mmu_context_32.h with 100% similarity]
arch/sparc/include/asm/mmu_context_64.h [moved from include/asm-sparc/mmu_context_64.h with 100% similarity]
arch/sparc/include/asm/mmzone.h [moved from include/asm-sparc/mmzone.h with 100% similarity]
arch/sparc/include/asm/module.h [moved from include/asm-sparc/module.h with 65% similarity]
arch/sparc/include/asm/module_32.h [moved from include/asm-sparc/module_32.h with 100% similarity]
arch/sparc/include/asm/module_64.h [moved from include/asm-sparc/module_64.h with 100% similarity]
arch/sparc/include/asm/mostek.h [moved from include/asm-sparc/mostek.h with 65% similarity]
arch/sparc/include/asm/mostek_32.h [moved from include/asm-sparc/mostek_32.h with 100% similarity]
arch/sparc/include/asm/mostek_64.h [moved from include/asm-sparc/mostek_64.h with 100% similarity]
arch/sparc/include/asm/mpmbox.h [moved from include/asm-sparc/mpmbox.h with 100% similarity]
arch/sparc/include/asm/msgbuf.h [moved from include/asm-sparc/msgbuf.h with 100% similarity]
arch/sparc/include/asm/msi.h [moved from include/asm-sparc/msi.h with 100% similarity]
arch/sparc/include/asm/mutex.h [moved from include/asm-sparc/mutex.h with 100% similarity]
arch/sparc/include/asm/mxcc.h [moved from include/asm-sparc/mxcc.h with 100% similarity]
arch/sparc/include/asm/ns87303.h [moved from include/asm-sparc/ns87303.h with 100% similarity]
arch/sparc/include/asm/obio.h [moved from include/asm-sparc/obio.h with 100% similarity]
arch/sparc/include/asm/of_device.h [moved from include/asm-sparc/of_device.h with 100% similarity]
arch/sparc/include/asm/of_platform.h [moved from include/asm-sparc/of_platform.h with 64% similarity]
arch/sparc/include/asm/of_platform_32.h [moved from include/asm-sparc/of_platform_32.h with 91% similarity]
arch/sparc/include/asm/of_platform_64.h [moved from include/asm-sparc/of_platform_64.h with 91% similarity]
arch/sparc/include/asm/openprom.h [moved from include/asm-sparc/openprom.h with 65% similarity]
arch/sparc/include/asm/openprom_32.h [moved from include/asm-sparc/openprom_32.h with 100% similarity]
arch/sparc/include/asm/openprom_64.h [moved from include/asm-sparc/openprom_64.h with 100% similarity]
arch/sparc/include/asm/openpromio.h [moved from include/asm-sparc/openpromio.h with 100% similarity]
arch/sparc/include/asm/oplib.h [moved from include/asm-sparc/oplib.h with 65% similarity]
arch/sparc/include/asm/oplib_32.h [moved from include/asm-sparc/oplib_32.h with 100% similarity]
arch/sparc/include/asm/oplib_64.h [moved from include/asm-sparc/oplib_64.h with 100% similarity]
arch/sparc/include/asm/page.h [moved from include/asm-sparc/page.h with 66% similarity]
arch/sparc/include/asm/page_32.h [moved from include/asm-sparc/page_32.h with 100% similarity]
arch/sparc/include/asm/page_64.h [moved from include/asm-sparc/page_64.h with 100% similarity]
arch/sparc/include/asm/param.h [moved from include/asm-sparc/param.h with 100% similarity]
arch/sparc/include/asm/parport.h [moved from include/asm-sparc/parport.h with 100% similarity]
arch/sparc/include/asm/pbm.h [moved from include/asm-sparc/pbm.h with 100% similarity]
arch/sparc/include/asm/pci.h [moved from include/asm-sparc/pci.h with 66% similarity]
arch/sparc/include/asm/pci_32.h [moved from include/asm-sparc/pci_32.h with 100% similarity]
arch/sparc/include/asm/pci_64.h [moved from include/asm-sparc/pci_64.h with 100% similarity]
arch/sparc/include/asm/pcic.h [moved from include/asm-sparc/pcic.h with 100% similarity]
arch/sparc/include/asm/percpu.h [moved from include/asm-sparc/percpu.h with 65% similarity]
arch/sparc/include/asm/percpu_32.h [moved from include/asm-sparc/percpu_32.h with 100% similarity]
arch/sparc/include/asm/percpu_64.h [moved from include/asm-sparc/percpu_64.h with 100% similarity]
arch/sparc/include/asm/perfctr.h [moved from include/asm-sparc/perfctr.h with 100% similarity]
arch/sparc/include/asm/pgalloc.h [moved from include/asm-sparc/pgalloc.h with 65% similarity]
arch/sparc/include/asm/pgalloc_32.h [moved from include/asm-sparc/pgalloc_32.h with 100% similarity]
arch/sparc/include/asm/pgalloc_64.h [moved from include/asm-sparc/pgalloc_64.h with 100% similarity]
arch/sparc/include/asm/pgtable.h [moved from include/asm-sparc/pgtable.h with 65% similarity]
arch/sparc/include/asm/pgtable_32.h [moved from include/asm-sparc/pgtable_32.h with 99% similarity]
arch/sparc/include/asm/pgtable_64.h [moved from include/asm-sparc/pgtable_64.h with 100% similarity]
arch/sparc/include/asm/pgtsrmmu.h [moved from include/asm-sparc/pgtsrmmu.h with 100% similarity]
arch/sparc/include/asm/pgtsun4.h [moved from include/asm-sparc/pgtsun4.h with 100% similarity]
arch/sparc/include/asm/pgtsun4c.h [moved from include/asm-sparc/pgtsun4c.h with 100% similarity]
arch/sparc/include/asm/pil.h [moved from include/asm-sparc/pil.h with 100% similarity]
arch/sparc/include/asm/poll.h [moved from include/asm-sparc/poll.h with 100% similarity]
arch/sparc/include/asm/posix_types.h [moved from include/asm-sparc/posix_types.h with 64% similarity]
arch/sparc/include/asm/posix_types_32.h [moved from include/asm-sparc/posix_types_32.h with 100% similarity]
arch/sparc/include/asm/posix_types_64.h [moved from include/asm-sparc/posix_types_64.h with 100% similarity]
arch/sparc/include/asm/processor.h [moved from include/asm-sparc/processor.h with 64% similarity]
arch/sparc/include/asm/processor_32.h [moved from include/asm-sparc/processor_32.h with 99% similarity]
arch/sparc/include/asm/processor_64.h [moved from include/asm-sparc/processor_64.h with 99% similarity]
arch/sparc/include/asm/prom.h [moved from include/asm-sparc/prom.h with 100% similarity]
arch/sparc/include/asm/psr.h [moved from include/asm-sparc/psr.h with 100% similarity]
arch/sparc/include/asm/psrcompat.h [moved from include/asm-sparc/psrcompat.h with 100% similarity]
arch/sparc/include/asm/pstate.h [moved from include/asm-sparc/pstate.h with 100% similarity]
arch/sparc/include/asm/ptrace.h [moved from include/asm-sparc/ptrace.h with 65% similarity]
arch/sparc/include/asm/ptrace_32.h [moved from include/asm-sparc/ptrace_32.h with 100% similarity]
arch/sparc/include/asm/ptrace_64.h [moved from include/asm-sparc/ptrace_64.h with 100% similarity]
arch/sparc/include/asm/reboot.h [moved from include/asm-sparc/reboot.h with 100% similarity]
arch/sparc/include/asm/reg.h [moved from include/asm-sparc/reg.h with 66% similarity]
arch/sparc/include/asm/reg_32.h [moved from include/asm-sparc/reg_32.h with 98% similarity]
arch/sparc/include/asm/reg_64.h [moved from include/asm-sparc/reg_64.h with 97% similarity]
arch/sparc/include/asm/resource.h [moved from include/asm-sparc/resource.h with 100% similarity]
arch/sparc/include/asm/ross.h [moved from include/asm-sparc/ross.h with 100% similarity]
arch/sparc/include/asm/rtc.h [moved from include/asm-sparc/rtc.h with 100% similarity]
arch/sparc/include/asm/rwsem-const.h [moved from include/asm-sparc/rwsem-const.h with 100% similarity]
arch/sparc/include/asm/rwsem.h [moved from include/asm-sparc/rwsem.h with 100% similarity]
arch/sparc/include/asm/sbi.h [moved from include/asm-sparc/sbi.h with 100% similarity]
arch/sparc/include/asm/sbus.h [moved from include/asm-sparc/sbus.h with 66% similarity]
arch/sparc/include/asm/sbus_32.h [moved from include/asm-sparc/sbus_32.h with 100% similarity]
arch/sparc/include/asm/sbus_64.h [moved from include/asm-sparc/sbus_64.h with 100% similarity]
arch/sparc/include/asm/scatterlist.h [moved from include/asm-sparc/scatterlist.h with 64% similarity]
arch/sparc/include/asm/scatterlist_32.h [moved from include/asm-sparc/scatterlist_32.h with 100% similarity]
arch/sparc/include/asm/scatterlist_64.h [moved from include/asm-sparc/scatterlist_64.h with 100% similarity]
arch/sparc/include/asm/scratchpad.h [moved from include/asm-sparc/scratchpad.h with 100% similarity]
arch/sparc/include/asm/seccomp.h [moved from include/asm-sparc/seccomp.h with 100% similarity]
arch/sparc/include/asm/sections.h [moved from include/asm-sparc/sections.h with 65% similarity]
arch/sparc/include/asm/sections_32.h [moved from include/asm-sparc/sections_32.h with 100% similarity]
arch/sparc/include/asm/sections_64.h [moved from include/asm-sparc/sections_64.h with 100% similarity]
arch/sparc/include/asm/sembuf.h [moved from include/asm-sparc/sembuf.h with 100% similarity]
arch/sparc/include/asm/setup.h [moved from include/asm-sparc/setup.h with 100% similarity]
arch/sparc/include/asm/sfafsr.h [moved from include/asm-sparc/sfafsr.h with 100% similarity]
arch/sparc/include/asm/sfp-machine.h [moved from include/asm-sparc/sfp-machine.h with 64% similarity]
arch/sparc/include/asm/sfp-machine_32.h [moved from include/asm-sparc/sfp-machine_32.h with 100% similarity]
arch/sparc/include/asm/sfp-machine_64.h [moved from include/asm-sparc/sfp-machine_64.h with 100% similarity]
arch/sparc/include/asm/shmbuf.h [moved from include/asm-sparc/shmbuf.h with 100% similarity]
arch/sparc/include/asm/shmparam.h [moved from include/asm-sparc/shmparam.h with 65% similarity]
arch/sparc/include/asm/shmparam_32.h [moved from include/asm-sparc/shmparam_32.h with 100% similarity]
arch/sparc/include/asm/shmparam_64.h [moved from include/asm-sparc/shmparam_64.h with 100% similarity]
arch/sparc/include/asm/sigcontext.h [moved from include/asm-sparc/sigcontext.h with 64% similarity]
arch/sparc/include/asm/sigcontext_32.h [moved from include/asm-sparc/sigcontext_32.h with 100% similarity]
arch/sparc/include/asm/sigcontext_64.h [moved from include/asm-sparc/sigcontext_64.h with 100% similarity]
arch/sparc/include/asm/siginfo.h [moved from include/asm-sparc/siginfo.h with 65% similarity]
arch/sparc/include/asm/siginfo_32.h [moved from include/asm-sparc/siginfo_32.h with 100% similarity]
arch/sparc/include/asm/siginfo_64.h [moved from include/asm-sparc/siginfo_64.h with 100% similarity]
arch/sparc/include/asm/signal.h [moved from include/asm-sparc/signal.h with 65% similarity]
arch/sparc/include/asm/signal_32.h [moved from include/asm-sparc/signal_32.h with 100% similarity]
arch/sparc/include/asm/signal_64.h [moved from include/asm-sparc/signal_64.h with 100% similarity]
arch/sparc/include/asm/smp.h [moved from include/asm-sparc/smp.h with 66% similarity]
arch/sparc/include/asm/smp_32.h [moved from include/asm-sparc/smp_32.h with 100% similarity]
arch/sparc/include/asm/smp_64.h [moved from include/asm-sparc/smp_64.h with 100% similarity]
arch/sparc/include/asm/smpprim.h [moved from include/asm-sparc/smpprim.h with 100% similarity]
arch/sparc/include/asm/socket.h [moved from include/asm-sparc/socket.h with 100% similarity]
arch/sparc/include/asm/sockios.h [moved from include/asm-sparc/sockios.h with 100% similarity]
arch/sparc/include/asm/sparsemem.h [moved from include/asm-sparc/sparsemem.h with 100% similarity]
arch/sparc/include/asm/spinlock.h [moved from include/asm-sparc/spinlock.h with 65% similarity]
arch/sparc/include/asm/spinlock_32.h [moved from include/asm-sparc/spinlock_32.h with 100% similarity]
arch/sparc/include/asm/spinlock_64.h [moved from include/asm-sparc/spinlock_64.h with 100% similarity]
arch/sparc/include/asm/spinlock_types.h [moved from include/asm-sparc/spinlock_types.h with 100% similarity]
arch/sparc/include/asm/spitfire.h [moved from include/asm-sparc/spitfire.h with 100% similarity]
arch/sparc/include/asm/sstate.h [moved from include/asm-sparc/sstate.h with 100% similarity]
arch/sparc/include/asm/stacktrace.h [moved from include/asm-sparc/stacktrace.h with 100% similarity]
arch/sparc/include/asm/starfire.h [moved from include/asm-sparc/starfire.h with 100% similarity]
arch/sparc/include/asm/stat.h [moved from include/asm-sparc/stat.h with 66% similarity]
arch/sparc/include/asm/stat_32.h [moved from include/asm-sparc/stat_32.h with 100% similarity]
arch/sparc/include/asm/stat_64.h [moved from include/asm-sparc/stat_64.h with 100% similarity]
arch/sparc/include/asm/statfs.h [moved from include/asm-sparc/statfs.h with 65% similarity]
arch/sparc/include/asm/statfs_32.h [moved from include/asm-sparc/statfs_32.h with 100% similarity]
arch/sparc/include/asm/statfs_64.h [moved from include/asm-sparc/statfs_64.h with 100% similarity]
arch/sparc/include/asm/string.h [moved from include/asm-sparc/string.h with 65% similarity]
arch/sparc/include/asm/string_32.h [moved from include/asm-sparc/string_32.h with 100% similarity]
arch/sparc/include/asm/string_64.h [moved from include/asm-sparc/string_64.h with 100% similarity]
arch/sparc/include/asm/sun4paddr.h [moved from include/asm-sparc/sun4paddr.h with 100% similarity]
arch/sparc/include/asm/sun4prom.h [moved from include/asm-sparc/sun4prom.h with 100% similarity]
arch/sparc/include/asm/sunbpp.h [moved from include/asm-sparc/sunbpp.h with 99% similarity]
arch/sparc/include/asm/swift.h [moved from include/asm-sparc/swift.h with 100% similarity]
arch/sparc/include/asm/syscalls.h [moved from include/asm-sparc/syscalls.h with 100% similarity]
arch/sparc/include/asm/sysen.h [moved from include/asm-sparc/sysen.h with 100% similarity]
arch/sparc/include/asm/system.h [moved from include/asm-sparc/system.h with 65% similarity]
arch/sparc/include/asm/system_32.h [moved from include/asm-sparc/system_32.h with 100% similarity]
arch/sparc/include/asm/system_64.h [moved from include/asm-sparc/system_64.h with 100% similarity]
arch/sparc/include/asm/termbits.h [moved from include/asm-sparc/termbits.h with 100% similarity]
arch/sparc/include/asm/termios.h [moved from include/asm-sparc/termios.h with 100% similarity]
arch/sparc/include/asm/thread_info.h [moved from include/asm-sparc/thread_info.h with 64% similarity]
arch/sparc/include/asm/thread_info_32.h [moved from include/asm-sparc/thread_info_32.h with 100% similarity]
arch/sparc/include/asm/thread_info_64.h [moved from include/asm-sparc/thread_info_64.h with 100% similarity]
arch/sparc/include/asm/timer.h [moved from include/asm-sparc/timer.h with 65% similarity]
arch/sparc/include/asm/timer_32.h [moved from include/asm-sparc/timer_32.h with 100% similarity]
arch/sparc/include/asm/timer_64.h [moved from include/asm-sparc/timer_64.h with 100% similarity]
arch/sparc/include/asm/timex.h [moved from include/asm-sparc/timex.h with 65% similarity]
arch/sparc/include/asm/timex_32.h [moved from include/asm-sparc/timex_32.h with 89% similarity]
arch/sparc/include/asm/timex_64.h [moved from include/asm-sparc/timex_64.h with 90% similarity]
arch/sparc/include/asm/tlb.h [moved from include/asm-sparc/tlb.h with 66% similarity]
arch/sparc/include/asm/tlb_32.h [moved from include/asm-sparc/tlb_32.h with 100% similarity]
arch/sparc/include/asm/tlb_64.h [moved from include/asm-sparc/tlb_64.h with 100% similarity]
arch/sparc/include/asm/tlbflush.h [moved from include/asm-sparc/tlbflush.h with 65% similarity]
arch/sparc/include/asm/tlbflush_32.h [moved from include/asm-sparc/tlbflush_32.h with 100% similarity]
arch/sparc/include/asm/tlbflush_64.h [moved from include/asm-sparc/tlbflush_64.h with 100% similarity]
arch/sparc/include/asm/topology.h [moved from include/asm-sparc/topology.h with 65% similarity]
arch/sparc/include/asm/topology_32.h [moved from include/asm-sparc/topology_32.h with 100% similarity]
arch/sparc/include/asm/topology_64.h [moved from include/asm-sparc/topology_64.h with 100% similarity]
arch/sparc/include/asm/traps.h [moved from include/asm-sparc/traps.h with 100% similarity]
arch/sparc/include/asm/tsb.h [moved from include/asm-sparc/tsb.h with 100% similarity]
arch/sparc/include/asm/tsunami.h [moved from include/asm-sparc/tsunami.h with 100% similarity]
arch/sparc/include/asm/ttable.h [moved from include/asm-sparc/ttable.h with 100% similarity]
arch/sparc/include/asm/turbosparc.h [moved from include/asm-sparc/turbosparc.h with 100% similarity]
arch/sparc/include/asm/types.h [moved from include/asm-sparc/types.h with 100% similarity]
arch/sparc/include/asm/uaccess.h [moved from include/asm-sparc/uaccess.h with 65% similarity]
arch/sparc/include/asm/uaccess_32.h [moved from include/asm-sparc/uaccess_32.h with 100% similarity]
arch/sparc/include/asm/uaccess_64.h [moved from include/asm-sparc/uaccess_64.h with 100% similarity]
arch/sparc/include/asm/uctx.h [moved from include/asm-sparc/uctx.h with 100% similarity]
arch/sparc/include/asm/unaligned.h [moved from include/asm-sparc/unaligned.h with 100% similarity]
arch/sparc/include/asm/unistd.h [moved from include/asm-sparc/unistd.h with 65% similarity]
arch/sparc/include/asm/unistd_32.h [moved from include/asm-sparc/unistd_32.h with 100% similarity]
arch/sparc/include/asm/unistd_64.h [moved from include/asm-sparc/unistd_64.h with 100% similarity]
arch/sparc/include/asm/upa.h [moved from include/asm-sparc/upa.h with 100% similarity]
arch/sparc/include/asm/user.h [moved from include/asm-sparc/user.h with 100% similarity]
arch/sparc/include/asm/utrap.h [moved from include/asm-sparc/utrap.h with 97% similarity]
arch/sparc/include/asm/vac-ops.h [moved from include/asm-sparc/vac-ops.h with 100% similarity]
arch/sparc/include/asm/vaddrs.h [moved from include/asm-sparc/vaddrs.h with 97% similarity]
arch/sparc/include/asm/vfc_ioctls.h [moved from include/asm-sparc/vfc_ioctls.h with 100% similarity]
arch/sparc/include/asm/vga.h [moved from include/asm-sparc/vga.h with 100% similarity]
arch/sparc/include/asm/viking.h [moved from include/asm-sparc/viking.h with 100% similarity]
arch/sparc/include/asm/vio.h [moved from include/asm-sparc/vio.h with 100% similarity]
arch/sparc/include/asm/visasm.h [moved from include/asm-sparc/visasm.h with 100% similarity]
arch/sparc/include/asm/watchdog.h [moved from include/asm-sparc/watchdog.h with 100% similarity]
arch/sparc/include/asm/winmacro.h [moved from include/asm-sparc/winmacro.h with 100% similarity]
arch/sparc/include/asm/xor.h [moved from include/asm-sparc/xor.h with 66% similarity]
arch/sparc/include/asm/xor_32.h [moved from include/asm-sparc/xor_32.h with 99% similarity]
arch/sparc/include/asm/xor_64.h [moved from include/asm-sparc/xor_64.h with 98% similarity]
arch/sparc64/kernel/compat_audit.c
include/asm-sparc64/Kbuild [deleted file]
include/asm-sparc64/agp.h [deleted file]
include/asm-sparc64/apb.h [deleted file]
include/asm-sparc64/asi.h [deleted file]
include/asm-sparc64/atomic.h [deleted file]
include/asm-sparc64/auxio.h [deleted file]
include/asm-sparc64/auxvec.h [deleted file]
include/asm-sparc64/backoff.h [deleted file]
include/asm-sparc64/bbc.h [deleted file]
include/asm-sparc64/bitops.h [deleted file]
include/asm-sparc64/bpp.h [deleted file]
include/asm-sparc64/bug.h [deleted file]
include/asm-sparc64/bugs.h [deleted file]
include/asm-sparc64/byteorder.h [deleted file]
include/asm-sparc64/cache.h [deleted file]
include/asm-sparc64/cacheflush.h [deleted file]
include/asm-sparc64/chafsr.h [deleted file]
include/asm-sparc64/checksum.h [deleted file]
include/asm-sparc64/chmctrl.h [deleted file]
include/asm-sparc64/cmt.h [deleted file]
include/asm-sparc64/compat.h [deleted file]
include/asm-sparc64/compat_signal.h [deleted file]
include/asm-sparc64/cpudata.h [deleted file]
include/asm-sparc64/cputime.h [deleted file]
include/asm-sparc64/current.h [deleted file]
include/asm-sparc64/dcr.h [deleted file]
include/asm-sparc64/dcu.h [deleted file]
include/asm-sparc64/delay.h [deleted file]
include/asm-sparc64/device.h [deleted file]
include/asm-sparc64/display7seg.h [deleted file]
include/asm-sparc64/div64.h [deleted file]
include/asm-sparc64/dma-mapping.h [deleted file]
include/asm-sparc64/dma.h [deleted file]
include/asm-sparc64/ebus.h [deleted file]
include/asm-sparc64/elf.h [deleted file]
include/asm-sparc64/emergency-restart.h [deleted file]
include/asm-sparc64/envctrl.h [deleted file]
include/asm-sparc64/errno.h [deleted file]
include/asm-sparc64/estate.h [deleted file]
include/asm-sparc64/fb.h [deleted file]
include/asm-sparc64/fbio.h [deleted file]
include/asm-sparc64/fcntl.h [deleted file]
include/asm-sparc64/fhc.h [deleted file]
include/asm-sparc64/floppy.h [deleted file]
include/asm-sparc64/fpumacro.h [deleted file]
include/asm-sparc64/futex.h [deleted file]
include/asm-sparc64/hardirq.h [deleted file]
include/asm-sparc64/head.h [deleted file]
include/asm-sparc64/hugetlb.h [deleted file]
include/asm-sparc64/hvtramp.h [deleted file]
include/asm-sparc64/hw_irq.h [deleted file]
include/asm-sparc64/hypervisor.h [deleted file]
include/asm-sparc64/ide.h [deleted file]
include/asm-sparc64/idprom.h [deleted file]
include/asm-sparc64/intr_queue.h [deleted file]
include/asm-sparc64/io.h [deleted file]
include/asm-sparc64/ioctl.h [deleted file]
include/asm-sparc64/ioctls.h [deleted file]
include/asm-sparc64/iommu.h [deleted file]
include/asm-sparc64/ipcbuf.h [deleted file]
include/asm-sparc64/irq.h [deleted file]
include/asm-sparc64/irq_regs.h [deleted file]
include/asm-sparc64/irqflags.h [deleted file]
include/asm-sparc64/kdebug.h [deleted file]
include/asm-sparc64/kgdb.h [deleted file]
include/asm-sparc64/kmap_types.h [deleted file]
include/asm-sparc64/kprobes.h [deleted file]
include/asm-sparc64/ldc.h [deleted file]
include/asm-sparc64/linkage.h [deleted file]
include/asm-sparc64/lmb.h [deleted file]
include/asm-sparc64/local.h [deleted file]
include/asm-sparc64/lsu.h [deleted file]
include/asm-sparc64/mc146818rtc.h [deleted file]
include/asm-sparc64/mdesc.h [deleted file]
include/asm-sparc64/mman.h [deleted file]
include/asm-sparc64/mmu.h [deleted file]
include/asm-sparc64/mmu_context.h [deleted file]
include/asm-sparc64/mmzone.h [deleted file]
include/asm-sparc64/module.h [deleted file]
include/asm-sparc64/mostek.h [deleted file]
include/asm-sparc64/msgbuf.h [deleted file]
include/asm-sparc64/mutex.h [deleted file]
include/asm-sparc64/ns87303.h [deleted file]
include/asm-sparc64/of_device.h [deleted file]
include/asm-sparc64/of_platform.h [deleted file]
include/asm-sparc64/openprom.h [deleted file]
include/asm-sparc64/openpromio.h [deleted file]
include/asm-sparc64/oplib.h [deleted file]
include/asm-sparc64/page.h [deleted file]
include/asm-sparc64/param.h [deleted file]
include/asm-sparc64/parport.h [deleted file]
include/asm-sparc64/pci.h [deleted file]
include/asm-sparc64/percpu.h [deleted file]
include/asm-sparc64/perfctr.h [deleted file]
include/asm-sparc64/pgalloc.h [deleted file]
include/asm-sparc64/pgtable.h [deleted file]
include/asm-sparc64/pil.h [deleted file]
include/asm-sparc64/poll.h [deleted file]
include/asm-sparc64/posix_types.h [deleted file]
include/asm-sparc64/processor.h [deleted file]
include/asm-sparc64/prom.h [deleted file]
include/asm-sparc64/psrcompat.h [deleted file]
include/asm-sparc64/pstate.h [deleted file]
include/asm-sparc64/ptrace.h [deleted file]
include/asm-sparc64/reboot.h [deleted file]
include/asm-sparc64/reg.h [deleted file]
include/asm-sparc64/resource.h [deleted file]
include/asm-sparc64/rtc.h [deleted file]
include/asm-sparc64/rwsem-const.h [deleted file]
include/asm-sparc64/rwsem.h [deleted file]
include/asm-sparc64/sbus.h [deleted file]
include/asm-sparc64/scatterlist.h [deleted file]
include/asm-sparc64/scratchpad.h [deleted file]
include/asm-sparc64/seccomp.h [deleted file]
include/asm-sparc64/sections.h [deleted file]
include/asm-sparc64/sembuf.h [deleted file]
include/asm-sparc64/setup.h [deleted file]
include/asm-sparc64/sfafsr.h [deleted file]
include/asm-sparc64/sfp-machine.h [deleted file]
include/asm-sparc64/shmbuf.h [deleted file]
include/asm-sparc64/shmparam.h [deleted file]
include/asm-sparc64/sigcontext.h [deleted file]
include/asm-sparc64/siginfo.h [deleted file]
include/asm-sparc64/signal.h [deleted file]
include/asm-sparc64/smp.h [deleted file]
include/asm-sparc64/socket.h [deleted file]
include/asm-sparc64/sockios.h [deleted file]
include/asm-sparc64/sparsemem.h [deleted file]
include/asm-sparc64/spinlock.h [deleted file]
include/asm-sparc64/spinlock_types.h [deleted file]
include/asm-sparc64/spitfire.h [deleted file]
include/asm-sparc64/sstate.h [deleted file]
include/asm-sparc64/stacktrace.h [deleted file]
include/asm-sparc64/starfire.h [deleted file]
include/asm-sparc64/stat.h [deleted file]
include/asm-sparc64/statfs.h [deleted file]
include/asm-sparc64/string.h [deleted file]
include/asm-sparc64/sunbpp.h [deleted file]
include/asm-sparc64/syscalls.h [deleted file]
include/asm-sparc64/system.h [deleted file]
include/asm-sparc64/termbits.h [deleted file]
include/asm-sparc64/termios.h [deleted file]
include/asm-sparc64/thread_info.h [deleted file]
include/asm-sparc64/timer.h [deleted file]
include/asm-sparc64/timex.h [deleted file]
include/asm-sparc64/tlb.h [deleted file]
include/asm-sparc64/tlbflush.h [deleted file]
include/asm-sparc64/topology.h [deleted file]
include/asm-sparc64/tsb.h [deleted file]
include/asm-sparc64/ttable.h [deleted file]
include/asm-sparc64/types.h [deleted file]
include/asm-sparc64/uaccess.h [deleted file]
include/asm-sparc64/uctx.h [deleted file]
include/asm-sparc64/unaligned.h [deleted file]
include/asm-sparc64/unistd.h [deleted file]
include/asm-sparc64/upa.h [deleted file]
include/asm-sparc64/user.h [deleted file]
include/asm-sparc64/utrap.h [deleted file]
include/asm-sparc64/vga.h [deleted file]
include/asm-sparc64/vio.h [deleted file]
include/asm-sparc64/visasm.h [deleted file]
include/asm-sparc64/watchdog.h [deleted file]
include/asm-sparc64/xor.h [deleted file]

index 40f24810116ccfcf9fe775b03c0fd58eef5fe905..baee3d414754f0b2c169ebd73d2876a8ad94d0c1 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -206,7 +206,11 @@ ifeq ($(ARCH),x86_64)
 endif
 
 # Where to locate arch specific headers
-hdr-arch       := $(SRCARCH)
+ifeq ($(ARCH),sparc64)
+       hdr-arch  := sparc
+else
+       hdr-arch  := $(SRCARCH)
+endif
 
 KCONFIG_CONFIG ?= .config
 
similarity index 65%
rename from include/asm-sparc/atomic.h
rename to arch/sparc/include/asm/atomic.h
index 66d8166ec1d7d768e321b7fe06414140ac7d7bf6..8ff83d8cc33fd7f4abd2f7ae2b018baa1006cdd7 100644 (file)
@@ -1,8 +1,8 @@
 #ifndef ___ASM_SPARC_ATOMIC_H
 #define ___ASM_SPARC_ATOMIC_H
 #if defined(__sparc__) && defined(__arch64__)
-#include <asm-sparc/atomic_64.h>
+#include <asm/atomic_64.h>
 #else
-#include <asm-sparc/atomic_32.h>
+#include <asm/atomic_32.h>
 #endif
 #endif
similarity index 65%
rename from include/asm-sparc/auxio.h
rename to arch/sparc/include/asm/auxio.h
index 24c6f3c0f5779c5ea9d2789ae8b91017f2ab97e3..13dc67f03011eae7624c26957cf4f6a5085a4c34 100644 (file)
@@ -1,8 +1,8 @@
 #ifndef ___ASM_SPARC_AUXIO_H
 #define ___ASM_SPARC_AUXIO_H
 #if defined(__sparc__) && defined(__arch64__)
-#include <asm-sparc/auxio_64.h>
+#include <asm/auxio_64.h>
 #else
-#include <asm-sparc/auxio_32.h>
+#include <asm/auxio_32.h>
 #endif
 #endif
similarity index 97%
rename from include/asm-sparc/auxio_32.h
rename to arch/sparc/include/asm/auxio_32.h
index 4db8f23db20f1c930c96354f529657525dced95f..e03e088be95f23eb2b01a1ab2915a22e47beb7dd 100644 (file)
@@ -36,7 +36,7 @@
  * understand the hardware you are querying!
  */
 extern void set_auxio(unsigned char bits_on, unsigned char bits_off);
-extern unsigned char get_auxio(void); /* .../asm-sparc/floppy.h */
+extern unsigned char get_auxio(void); /* .../asm/floppy.h */
 
 /*
  * The following routines are provided for driver-compatibility
similarity index 65%
rename from include/asm-sparc/bitops.h
rename to arch/sparc/include/asm/bitops.h
index 1a2949d0193fa85defd4a7a2698bf4afb372b7cf..b1edd94bd64f398d6363132519ab995cc549c452 100644 (file)
@@ -1,8 +1,8 @@
 #ifndef ___ASM_SPARC_BITOPS_H
 #define ___ASM_SPARC_BITOPS_H
 #if defined(__sparc__) && defined(__arch64__)
-#include <asm-sparc/bitops_64.h>
+#include <asm/bitops_64.h>
 #else
-#include <asm-sparc/bitops_32.h>
+#include <asm/bitops_32.h>
 #endif
 #endif
similarity index 99%
rename from include/asm-sparc/btfixup.h
rename to arch/sparc/include/asm/btfixup.h
index 08277e6fb4cd51dcc5a5349c782d70ab4ba07361..797722cf69f2869943f4d347a4acb6ad9f72bb77 100644 (file)
@@ -1,5 +1,5 @@
 /*
- *  asm-sparc/btfixup.h:    Macros for boot time linking.
+ *  asm/btfixup.h:    Macros for boot time linking.
  *
  *  Copyright (C) 1998 Jakub Jelinek (jj@sunsite.mff.cuni.cz)
  */
similarity index 87%
rename from include/asm-sparc/bugs.h
rename to arch/sparc/include/asm/bugs.h
index 2dfc07bc8e5472ec9b319dd137a8c7a69535338e..e179bc12f64a478ff9d3eaba6bf337f1a27b1539 100644 (file)
@@ -1,4 +1,4 @@
-/* include/asm-sparc/bugs.h:  Sparc probes for various bugs.
+/* include/asm/bugs.h:  Sparc probes for various bugs.
  *
  * Copyright (C) 1996, 2007 David S. Miller (davem@davemloft.net)
  */
similarity index 64%
rename from include/asm-sparc/cacheflush.h
rename to arch/sparc/include/asm/cacheflush.h
index 2b6a37957c2da803739a7e0a71779ea264f2b5d4..049168087b198fd37e5a144bc55e7682ef1ffc6f 100644 (file)
@@ -1,8 +1,8 @@
 #ifndef ___ASM_SPARC_CACHEFLUSH_H
 #define ___ASM_SPARC_CACHEFLUSH_H
 #if defined(__sparc__) && defined(__arch64__)
-#include <asm-sparc/cacheflush_64.h>
+#include <asm/cacheflush_64.h>
 #else
-#include <asm-sparc/cacheflush_32.h>
+#include <asm/cacheflush_32.h>
 #endif
 #endif
similarity index 65%
rename from include/asm-sparc/checksum.h
rename to arch/sparc/include/asm/checksum.h
index 4e3553d4f6e17a3eb6c07be765b1fe08b4542604..7ac0d7497bc593bbc6c87f69964073cbcd8d1d14 100644 (file)
@@ -1,8 +1,8 @@
 #ifndef ___ASM_SPARC_CHECKSUM_H
 #define ___ASM_SPARC_CHECKSUM_H
 #if defined(__sparc__) && defined(__arch64__)
-#include <asm-sparc/checksum_64.h>
+#include <asm/checksum_64.h>
 #else
-#include <asm-sparc/checksum_32.h>
+#include <asm/checksum_32.h>
 #endif
 #endif
similarity index 65%
rename from include/asm-sparc/cpudata.h
rename to arch/sparc/include/asm/cpudata.h
index b76fac0c8d8feb549fcb7d43c9e18ebdb7449933..b5976de7cacdb32528f576eef418ce4d35685e4e 100644 (file)
@@ -1,8 +1,8 @@
 #ifndef ___ASM_SPARC_CPUDATA_H
 #define ___ASM_SPARC_CPUDATA_H
 #if defined(__sparc__) && defined(__arch64__)
-#include <asm-sparc/cpudata_64.h>
+#include <asm/cpudata_64.h>
 #else
-#include <asm-sparc/cpudata_32.h>
+#include <asm/cpudata_32.h>
 #endif
 #endif
similarity index 89%
rename from include/asm-sparc/cpudata_32.h
rename to arch/sparc/include/asm/cpudata_32.h
index a2c4d51d36c4c478f81dc0ba99a05a8809690137..31d48a0e32c7cd3cd3b4eda72325229496f00411 100644 (file)
@@ -2,7 +2,7 @@
  *
  * Copyright (C) 2004 Keith M Wesolowski (wesolows@foobazco.org)
  *
- * Based on include/asm-sparc64/cpudata.h and Linux 2.4 smp.h
+ * Based on include/asm/cpudata.h and Linux 2.4 smp.h
  * both (C) David S. Miller.
  */
 
similarity index 96%
rename from include/asm-sparc/current.h
rename to arch/sparc/include/asm/current.h
index 8a1d9d6643b059343919a615064fb0068246a2be..10a0df55a574aeb8758e57c99073ccf8cf4e2d54 100644 (file)
@@ -1,4 +1,4 @@
-/* include/asm-sparc/current.h
+/* include/asm/current.h
  *
  * Copyright (C) 1999 IBM Deutschland Entwicklung GmbH, IBM Corporation
  * Copyright (C) 2002 Pete Zaitcev (zaitcev@yahoo.com)
similarity index 65%
rename from include/asm-sparc/delay.h
rename to arch/sparc/include/asm/delay.h
index 6210a3ce97517860de53a9b1823a4eaa5b56e871..467caa2a97a04199ec379aa1540a29c7fd62a49d 100644 (file)
@@ -1,8 +1,8 @@
 #ifndef ___ASM_SPARC_DELAY_H
 #define ___ASM_SPARC_DELAY_H
 #if defined(__sparc__) && defined(__arch64__)
-#include <asm-sparc/delay_64.h>
+#include <asm/delay_64.h>
 #else
-#include <asm-sparc/delay_32.h>
+#include <asm/delay_32.h>
 #endif
 #endif
similarity index 64%
rename from include/asm-sparc/dma-mapping.h
rename to arch/sparc/include/asm/dma-mapping.h
index 7483504259cef140dd187a87af7025a18d689486..0f4150e26619c3a2063f92abe4ff95ca8dece6cc 100644 (file)
@@ -1,8 +1,8 @@
 #ifndef ___ASM_SPARC_DMA_MAPPING_H
 #define ___ASM_SPARC_DMA_MAPPING_H
 #if defined(__sparc__) && defined(__arch64__)
-#include <asm-sparc/dma-mapping_64.h>
+#include <asm/dma-mapping_64.h>
 #else
-#include <asm-sparc/dma-mapping_32.h>
+#include <asm/dma-mapping_32.h>
 #endif
 #endif
similarity index 66%
rename from include/asm-sparc/dma.h
rename to arch/sparc/include/asm/dma.h
index 8cc69bfaae2ab8459433dadaf6a10ce1e20eae65..aa1d90ac04c58b2db3c907ab8e5555aa7ae90b75 100644 (file)
@@ -1,8 +1,8 @@
 #ifndef ___ASM_SPARC_DMA_H
 #define ___ASM_SPARC_DMA_H
 #if defined(__sparc__) && defined(__arch64__)
-#include <asm-sparc/dma_64.h>
+#include <asm/dma_64.h>
 #else
-#include <asm-sparc/dma_32.h>
+#include <asm/dma_32.h>
 #endif
 #endif
similarity index 99%
rename from include/asm-sparc/dma_32.h
rename to arch/sparc/include/asm/dma_32.h
index 959d6c8a71ae72365f6d33e2c1921bebbe012317..cf7189c0079b2c3b6b46c02b65e53d70caddd506 100644 (file)
@@ -1,4 +1,4 @@
-/* include/asm-sparc/dma.h
+/* include/asm/dma.h
  *
  * Copyright 1995 (C) David S. Miller (davem@davemloft.net)
  */
similarity index 99%
rename from include/asm-sparc/dma_64.h
rename to arch/sparc/include/asm/dma_64.h
index 9d4c024bd3b3874f0091c4c3e83cd4392006110f..46a8aecffc02c182b63cf794e83746ac64499674 100644 (file)
@@ -1,5 +1,5 @@
 /*
- * include/asm-sparc64/dma.h
+ * include/asm/dma.h
  *
  * Copyright 1996 (C) David S. Miller (davem@caip.rutgers.edu)
  */
similarity index 66%
rename from include/asm-sparc/ebus.h
rename to arch/sparc/include/asm/ebus.h
index a5da2d00cd1814728af538bbca535919f2086cdd..83a6d16c22e68bd5c7f463fb13edc5a7e6af0949 100644 (file)
@@ -1,8 +1,8 @@
 #ifndef ___ASM_SPARC_EBUS_H
 #define ___ASM_SPARC_EBUS_H
 #if defined(__sparc__) && defined(__arch64__)
-#include <asm-sparc/ebus_64.h>
+#include <asm/ebus_64.h>
 #else
-#include <asm-sparc/ebus_32.h>
+#include <asm/ebus_32.h>
 #endif
 #endif
similarity index 66%
rename from include/asm-sparc/elf.h
rename to arch/sparc/include/asm/elf.h
index f035c45d7b5e3ee4f02fce36767775fd85083cb3..0a2816c50b07faa54c98a1b75798d4d192ddc2da 100644 (file)
@@ -1,8 +1,8 @@
 #ifndef ___ASM_SPARC_ELF_H
 #define ___ASM_SPARC_ELF_H
 #if defined(__sparc__) && defined(__arch64__)
-#include <asm-sparc/elf_64.h>
+#include <asm/elf_64.h>
 #else
-#include <asm-sparc/elf_32.h>
+#include <asm/elf_32.h>
 #endif
 #endif
similarity index 65%
rename from include/asm-sparc/floppy.h
rename to arch/sparc/include/asm/floppy.h
index 6c628ba15a8d62ceaccb1e0124457435c478b445..faebd335b600647493ff6306f817220b23167af6 100644 (file)
@@ -1,8 +1,8 @@
 #ifndef ___ASM_SPARC_FLOPPY_H
 #define ___ASM_SPARC_FLOPPY_H
 #if defined(__sparc__) && defined(__arch64__)
-#include <asm-sparc/floppy_64.h>
+#include <asm/floppy_64.h>
 #else
-#include <asm-sparc/floppy_32.h>
+#include <asm/floppy_32.h>
 #endif
 #endif
similarity index 99%
rename from include/asm-sparc/floppy_32.h
rename to arch/sparc/include/asm/floppy_32.h
index acdd06eafe596c0c360264f44e6be4bdf379a2d9..ae3f00bf22ff91d990ab4c47aaa200729c570181 100644 (file)
@@ -1,4 +1,4 @@
-/* asm-sparc/floppy.h: Sparc specific parts of the Floppy driver.
+/* asm/floppy.h: Sparc specific parts of the Floppy driver.
  *
  * Copyright (C) 1995 David S. Miller (davem@davemloft.net)
  */
similarity index 65%
rename from include/asm-sparc/futex.h
rename to arch/sparc/include/asm/futex.h
index c6a9f038c531b22defd2ba117c975a14c660f747..736335f3671370532ce9c8ced8e0adb14e42776a 100644 (file)
@@ -1,8 +1,8 @@
 #ifndef ___ASM_SPARC_FUTEX_H
 #define ___ASM_SPARC_FUTEX_H
 #if defined(__sparc__) && defined(__arch64__)
-#include <asm-sparc/futex_64.h>
+#include <asm/futex_64.h>
 #else
-#include <asm-sparc/futex_32.h>
+#include <asm/futex_32.h>
 #endif
 #endif
similarity index 65%
rename from include/asm-sparc/hardirq.h
rename to arch/sparc/include/asm/hardirq.h
index 15647877310031815fdbcfc2bada8d5de6c856f2..44d4e23451486a9c3d5f0041c42c58bbd3bb145c 100644 (file)
@@ -1,8 +1,8 @@
 #ifndef ___ASM_SPARC_HARDIRQ_H
 #define ___ASM_SPARC_HARDIRQ_H
 #if defined(__sparc__) && defined(__arch64__)
-#include <asm-sparc/hardirq_64.h>
+#include <asm/hardirq_64.h>
 #else
-#include <asm-sparc/hardirq_32.h>
+#include <asm/hardirq_32.h>
 #endif
 #endif
similarity index 66%
rename from include/asm-sparc/head.h
rename to arch/sparc/include/asm/head.h
index 14652abdea31c42cf97a6a3dc93df7bcb19804ca..be8f03f3e731d568e2260bb09bb1006708a9e2cb 100644 (file)
@@ -1,8 +1,8 @@
 #ifndef ___ASM_SPARC_HEAD_H
 #define ___ASM_SPARC_HEAD_H
 #if defined(__sparc__) && defined(__arch64__)
-#include <asm-sparc/head_64.h>
+#include <asm/head_64.h>
 #else
-#include <asm-sparc/head_32.h>
+#include <asm/head_32.h>
 #endif
 #endif
similarity index 67%
rename from include/asm-sparc/io.h
rename to arch/sparc/include/asm/io.h
index fc9024d3dfc30f5fdd7990c581abc33e19acc93b..a34b2994937ab2e4323de0308ab8a630729dcf70 100644 (file)
@@ -1,8 +1,8 @@
 #ifndef ___ASM_SPARC_IO_H
 #define ___ASM_SPARC_IO_H
 #if defined(__sparc__) && defined(__arch64__)
-#include <asm-sparc/io_64.h>
+#include <asm/io_64.h>
 #else
-#include <asm-sparc/io_32.h>
+#include <asm/io_32.h>
 #endif
 #endif
similarity index 65%
rename from include/asm-sparc/iommu.h
rename to arch/sparc/include/asm/iommu.h
index 91b072b0d7a083b1dfa272b7622ecf25d9859974..e650965b4a8d18224c0e68b9abd52d9bdf996fcf 100644 (file)
@@ -1,8 +1,8 @@
 #ifndef ___ASM_SPARC_IOMMU_H
 #define ___ASM_SPARC_IOMMU_H
 #if defined(__sparc__) && defined(__arch64__)
-#include <asm-sparc/iommu_64.h>
+#include <asm/iommu_64.h>
 #else
-#include <asm-sparc/iommu_32.h>
+#include <asm/iommu_32.h>
 #endif
 #endif
similarity index 65%
rename from include/asm-sparc/ipcbuf.h
rename to arch/sparc/include/asm/ipcbuf.h
index 037605d986e25f7c527468c67ee33330c2bce9a1..17d6ef7b23a480665487925d0837ccd688833a73 100644 (file)
@@ -1,8 +1,8 @@
 #ifndef ___ASM_SPARC_IPCBUF_H
 #define ___ASM_SPARC_IPCBUF_H
 #if defined(__sparc__) && defined(__arch64__)
-#include <asm-sparc/ipcbuf_64.h>
+#include <asm/ipcbuf_64.h>
 #else
-#include <asm-sparc/ipcbuf_32.h>
+#include <asm/ipcbuf_32.h>
 #endif
 #endif
similarity index 66%
rename from include/asm-sparc/irq.h
rename to arch/sparc/include/asm/irq.h
index 7af6bb4aa09c8043c68f42fb7ae1a620afc61d57..3b44a6a140747d91837a415496d4b3a065b02abe 100644 (file)
@@ -1,8 +1,8 @@
 #ifndef ___ASM_SPARC_IRQ_H
 #define ___ASM_SPARC_IRQ_H
 #if defined(__sparc__) && defined(__arch64__)
-#include <asm-sparc/irq_64.h>
+#include <asm/irq_64.h>
 #else
-#include <asm-sparc/irq_32.h>
+#include <asm/irq_32.h>
 #endif
 #endif
similarity index 65%
rename from include/asm-sparc/irqflags.h
rename to arch/sparc/include/asm/irqflags.h
index c6402b187e23cca383976e3beacc6bafd8968919..1e138632bd3f03689da1583cb6e70cd377e74698 100644 (file)
@@ -1,8 +1,8 @@
 #ifndef ___ASM_SPARC_IRQFLAGS_H
 #define ___ASM_SPARC_IRQFLAGS_H
 #if defined(__sparc__) && defined(__arch64__)
-#include <asm-sparc/irqflags_64.h>
+#include <asm/irqflags_64.h>
 #else
-#include <asm-sparc/irqflags_32.h>
+#include <asm/irqflags_32.h>
 #endif
 #endif
similarity index 96%
rename from include/asm-sparc/irqflags_32.h
rename to arch/sparc/include/asm/irqflags_32.h
index db398fb328263051be401e0e0aabb97fcdf2a77f..0fca9d97d44f15bd1a3832de7e02a990e0fa6577 100644 (file)
@@ -1,5 +1,5 @@
 /*
- * include/asm-sparc/irqflags.h
+ * include/asm/irqflags.h
  *
  * IRQ flags handling
  *
similarity index 97%
rename from include/asm-sparc/irqflags_64.h
rename to arch/sparc/include/asm/irqflags_64.h
index 024fc54d068205befa262d80582d6dc591f34fe6..bb42e59162aab85829566a369255a55ce67180aa 100644 (file)
@@ -1,5 +1,5 @@
 /*
- * include/asm-sparc64/irqflags.h
+ * include/asm/irqflags.h
  *
  * IRQ flags handling
  *
similarity index 65%
rename from include/asm-sparc/kdebug.h
rename to arch/sparc/include/asm/kdebug.h
index fe07d00d0534424d0d295341f60ba59cd72e3510..8d12581ca38616458ee1a04a9e7454b6208caa4c 100644 (file)
@@ -1,8 +1,8 @@
 #ifndef ___ASM_SPARC_KDEBUG_H
 #define ___ASM_SPARC_KDEBUG_H
 #if defined(__sparc__) && defined(__arch64__)
-#include <asm-sparc/kdebug_64.h>
+#include <asm/kdebug_64.h>
 #else
-#include <asm-sparc/kdebug_32.h>
+#include <asm/kdebug_32.h>
 #endif
 #endif
similarity index 64%
rename from include/asm-sparc/mc146818rtc.h
rename to arch/sparc/include/asm/mc146818rtc.h
index 9ab65c21e9e43233b2c9c925438bf4c8f1cceba7..67ed9e3a02357260dacd8a065ef8840a9a34de56 100644 (file)
@@ -1,8 +1,8 @@
 #ifndef ___ASM_SPARC_MC146818RTC_H
 #define ___ASM_SPARC_MC146818RTC_H
 #if defined(__sparc__) && defined(__arch64__)
-#include <asm-sparc/mc146818rtc_64.h>
+#include <asm/mc146818rtc_64.h>
 #else
-#include <asm-sparc/mc146818rtc_32.h>
+#include <asm/mc146818rtc_32.h>
 #endif
 #endif
similarity index 66%
rename from include/asm-sparc/mmu.h
rename to arch/sparc/include/asm/mmu.h
index ee66bf6dcbd6b1deefbc8a2b90dc5f65d2385827..88fa313887dbafff2db6f62fbb5a8c1eef805a07 100644 (file)
@@ -1,8 +1,8 @@
 #ifndef ___ASM_SPARC_MMU_H
 #define ___ASM_SPARC_MMU_H
 #if defined(__sparc__) && defined(__arch64__)
-#include <asm-sparc/mmu_64.h>
+#include <asm/mmu_64.h>
 #else
-#include <asm-sparc/mmu_32.h>
+#include <asm/mmu_32.h>
 #endif
 #endif
similarity index 64%
rename from include/asm-sparc/mmu_context.h
rename to arch/sparc/include/asm/mmu_context.h
index e14efb9532ff235c4f5f6e769197a8f557584953..5531346c64f9b55d90d58b07437cc5a1b842ab49 100644 (file)
@@ -1,8 +1,8 @@
 #ifndef ___ASM_SPARC_MMU_CONTEXT_H
 #define ___ASM_SPARC_MMU_CONTEXT_H
 #if defined(__sparc__) && defined(__arch64__)
-#include <asm-sparc/mmu_context_64.h>
+#include <asm/mmu_context_64.h>
 #else
-#include <asm-sparc/mmu_context_32.h>
+#include <asm/mmu_context_32.h>
 #endif
 #endif
similarity index 65%
rename from include/asm-sparc/module.h
rename to arch/sparc/include/asm/module.h
index 516138fe681a53117f673b942ba1b293a203ccee..e82cf9a3e60ee53e22ba05abdb0ef2a024e8b487 100644 (file)
@@ -1,8 +1,8 @@
 #ifndef ___ASM_SPARC_MODULE_H
 #define ___ASM_SPARC_MODULE_H
 #if defined(__sparc__) && defined(__arch64__)
-#include <asm-sparc/module_64.h>
+#include <asm/module_64.h>
 #else
-#include <asm-sparc/module_32.h>
+#include <asm/module_32.h>
 #endif
 #endif
similarity index 65%
rename from include/asm-sparc/mostek.h
rename to arch/sparc/include/asm/mostek.h
index 5b9f7fec7ee74cb1b6bb2d72bb952d5268ef8b82..433be3e0a69b375d057ae4a424ab61c806703b59 100644 (file)
@@ -1,8 +1,8 @@
 #ifndef ___ASM_SPARC_MOSTEK_H
 #define ___ASM_SPARC_MOSTEK_H
 #if defined(__sparc__) && defined(__arch64__)
-#include <asm-sparc/mostek_64.h>
+#include <asm/mostek_64.h>
 #else
-#include <asm-sparc/mostek_32.h>
+#include <asm/mostek_32.h>
 #endif
 #endif
similarity index 64%
rename from include/asm-sparc/of_platform.h
rename to arch/sparc/include/asm/of_platform.h
index 851eb84d737ef61a3eb9ea9fe2c1bcc459373acf..aa699775ffba8c9dd40b56465d725f6aba224fb1 100644 (file)
@@ -1,8 +1,8 @@
 #ifndef ___ASM_SPARC_OF_PLATFORM_H
 #define ___ASM_SPARC_OF_PLATFORM_H
 #if defined(__sparc__) && defined(__arch64__)
-#include <asm-sparc/of_platform_64.h>
+#include <asm/of_platform_64.h>
 #else
-#include <asm-sparc/of_platform_32.h>
+#include <asm/of_platform_32.h>
 #endif
 #endif
similarity index 91%
rename from include/asm-sparc/of_platform_32.h
rename to arch/sparc/include/asm/of_platform_32.h
index 38334351c36b04685861015c7a997676bd224b3a..723f7c9b7411dbce7f5d995b1538a26928cdd630 100644 (file)
@@ -3,7 +3,7 @@
 /*
  *    Copyright (C) 2006 Benjamin Herrenschmidt, IBM Corp.
  *                      <benh@kernel.crashing.org>
- *    Modified for Sparc by merging parts of asm-sparc/of_device.h
+ *    Modified for Sparc by merging parts of asm/of_device.h
  *             by Stephen Rothwell
  *
  *  This program is free software; you can redistribute it and/or
similarity index 91%
rename from include/asm-sparc/of_platform_64.h
rename to arch/sparc/include/asm/of_platform_64.h
index 78aa032b674c42bb7a4e1f02aaa6d243d298d13f..4f66a5f6342d88dae63419b799707fbabba1c3f2 100644 (file)
@@ -3,7 +3,7 @@
 /*
  *    Copyright (C) 2006 Benjamin Herrenschmidt, IBM Corp.
  *                      <benh@kernel.crashing.org>
- *    Modified for Sparc by merging parts of asm-sparc/of_device.h
+ *    Modified for Sparc by merging parts of asm/of_device.h
  *             by Stephen Rothwell
  *
  *  This program is free software; you can redistribute it and/or
similarity index 65%
rename from include/asm-sparc/openprom.h
rename to arch/sparc/include/asm/openprom.h
index 8c349f0619946939cbcef609a403db678620e495..aaeae905ed3f945482a27d812a7df0b245ec22a9 100644 (file)
@@ -1,8 +1,8 @@
 #ifndef ___ASM_SPARC_OPENPROM_H
 #define ___ASM_SPARC_OPENPROM_H
 #if defined(__sparc__) && defined(__arch64__)
-#include <asm-sparc/openprom_64.h>
+#include <asm/openprom_64.h>
 #else
-#include <asm-sparc/openprom_32.h>
+#include <asm/openprom_32.h>
 #endif
 #endif
similarity index 65%
rename from include/asm-sparc/oplib.h
rename to arch/sparc/include/asm/oplib.h
index e88d7c04a292279013e44b15a83843752d4dffa0..72e04e13a6b4059b1c0f5a0946c2510db51f6ce9 100644 (file)
@@ -1,8 +1,8 @@
 #ifndef ___ASM_SPARC_OPLIB_H
 #define ___ASM_SPARC_OPLIB_H
 #if defined(__sparc__) && defined(__arch64__)
-#include <asm-sparc/oplib_64.h>
+#include <asm/oplib_64.h>
 #else
-#include <asm-sparc/oplib_32.h>
+#include <asm/oplib_32.h>
 #endif
 #endif
similarity index 66%
rename from include/asm-sparc/page.h
rename to arch/sparc/include/asm/page.h
index f32f49fcf75c71f4cf37f4b0123dc833a1a19f7c..f21de034902596744ed071a80b0a53147b04460e 100644 (file)
@@ -1,8 +1,8 @@
 #ifndef ___ASM_SPARC_PAGE_H
 #define ___ASM_SPARC_PAGE_H
 #if defined(__sparc__) && defined(__arch64__)
-#include <asm-sparc/page_64.h>
+#include <asm/page_64.h>
 #else
-#include <asm-sparc/page_32.h>
+#include <asm/page_32.h>
 #endif
 #endif
similarity index 66%
rename from include/asm-sparc/pci.h
rename to arch/sparc/include/asm/pci.h
index b807d52a48091164b0010be6bd4466863508ed8c..6e14fd179335d0a24d05cc71293589b63331607f 100644 (file)
@@ -1,8 +1,8 @@
 #ifndef ___ASM_SPARC_PCI_H
 #define ___ASM_SPARC_PCI_H
 #if defined(__sparc__) && defined(__arch64__)
-#include <asm-sparc/pci_64.h>
+#include <asm/pci_64.h>
 #else
-#include <asm-sparc/pci_32.h>
+#include <asm/pci_32.h>
 #endif
 #endif
similarity index 65%
rename from include/asm-sparc/percpu.h
rename to arch/sparc/include/asm/percpu.h
index d98ed6cf2e36cdc31541e80bdcb9abd8d9f44a86..bfb1d19ff1bf1ed11303f2a50895d3c692601d90 100644 (file)
@@ -1,8 +1,8 @@
 #ifndef ___ASM_SPARC_PERCPU_H
 #define ___ASM_SPARC_PERCPU_H
 #if defined(__sparc__) && defined(__arch64__)
-#include <asm-sparc/percpu_64.h>
+#include <asm/percpu_64.h>
 #else
-#include <asm-sparc/percpu_32.h>
+#include <asm/percpu_32.h>
 #endif
 #endif
similarity index 65%
rename from include/asm-sparc/pgalloc.h
rename to arch/sparc/include/asm/pgalloc.h
index 7fa02b53d392cef4e9c48a82decdbc639c9b97ae..b6db1f7cdcab325d216c4549a4e3426cf73ca9b5 100644 (file)
@@ -1,8 +1,8 @@
 #ifndef ___ASM_SPARC_PGALLOC_H
 #define ___ASM_SPARC_PGALLOC_H
 #if defined(__sparc__) && defined(__arch64__)
-#include <asm-sparc/pgalloc_64.h>
+#include <asm/pgalloc_64.h>
 #else
-#include <asm-sparc/pgalloc_32.h>
+#include <asm/pgalloc_32.h>
 #endif
 #endif
similarity index 65%
rename from include/asm-sparc/pgtable.h
rename to arch/sparc/include/asm/pgtable.h
index 63cdef53bc52ef78ef6521cfe19205be61001d1e..59ba6f6207322ef7533a73998f54d1b1b888fc94 100644 (file)
@@ -1,8 +1,8 @@
 #ifndef ___ASM_SPARC_PGTABLE_H
 #define ___ASM_SPARC_PGTABLE_H
 #if defined(__sparc__) && defined(__arch64__)
-#include <asm-sparc/pgtable_64.h>
+#include <asm/pgtable_64.h>
 #else
-#include <asm-sparc/pgtable_32.h>
+#include <asm/pgtable_32.h>
 #endif
 #endif
similarity index 99%
rename from include/asm-sparc/pgtable_32.h
rename to arch/sparc/include/asm/pgtable_32.h
index 781bd4694a1c1fd2ce698c84c014caecf189bf97..08237fda8874390b267a2036564f364e79eaf1a6 100644 (file)
@@ -1,7 +1,7 @@
 #ifndef _SPARC_PGTABLE_H
 #define _SPARC_PGTABLE_H
 
-/*  asm-sparc/pgtable.h:  Defines and functions used to work
+/*  asm/pgtable.h:  Defines and functions used to work
  *                        with Sparc page tables.
  *
  *  Copyright (C) 1995 David S. Miller (davem@caip.rutgers.edu)
similarity index 64%
rename from include/asm-sparc/posix_types.h
rename to arch/sparc/include/asm/posix_types.h
index 58c820d75e8335db5ab20f7bf375d6f2706fe802..03a0e091a884a1909e5f2e7fb8a03e01a0079370 100644 (file)
@@ -1,8 +1,8 @@
 #ifndef ___ASM_SPARC_POSIX_TYPES_H
 #define ___ASM_SPARC_POSIX_TYPES_H
 #if defined(__sparc__) && defined(__arch64__)
-#include <asm-sparc/posix_types_64.h>
+#include <asm/posix_types_64.h>
 #else
-#include <asm-sparc/posix_types_32.h>
+#include <asm/posix_types_32.h>
 #endif
 #endif
similarity index 64%
rename from include/asm-sparc/processor.h
rename to arch/sparc/include/asm/processor.h
index 11a66bb02eaa01b1dc520e05dfef5adfd2193823..9da9646bf6c6b326ee6d6f47b1d60bd4dd970453 100644 (file)
@@ -1,8 +1,8 @@
 #ifndef ___ASM_SPARC_PROCESSOR_H
 #define ___ASM_SPARC_PROCESSOR_H
 #if defined(__sparc__) && defined(__arch64__)
-#include <asm-sparc/processor_64.h>
+#include <asm/processor_64.h>
 #else
-#include <asm-sparc/processor_32.h>
+#include <asm/processor_32.h>
 #endif
 #endif
similarity index 99%
rename from include/asm-sparc/processor_32.h
rename to arch/sparc/include/asm/processor_32.h
index 562c0d69c537adc6914dc100c1e10124a92a3c4c..718e7e01418180186fc183bd1f3988854e9d45bb 100644 (file)
@@ -1,4 +1,4 @@
-/* include/asm-sparc/processor.h
+/* include/asm/processor.h
  *
  * Copyright (C) 1994 David S. Miller (davem@caip.rutgers.edu)
  */
similarity index 99%
rename from include/asm-sparc/processor_64.h
rename to arch/sparc/include/asm/processor_64.h
index 70d42801a0d20cd08f78eb5dcc544adf49cafc19..137a6bd72fc805f9ddfd4f4a12acd3fdf7199c78 100644 (file)
@@ -1,5 +1,5 @@
 /*
- * include/asm-sparc64/processor.h
+ * include/asm/processor.h
  *
  * Copyright (C) 1996 David S. Miller (davem@caip.rutgers.edu)
  */
similarity index 65%
rename from include/asm-sparc/ptrace.h
rename to arch/sparc/include/asm/ptrace.h
index f36ab6c30ff30cbf19c71e39af7a33c877b4b4bb..6dcbe2eed2e201a4c8bc980dcb15b868474fbcf3 100644 (file)
@@ -1,8 +1,8 @@
 #ifndef ___ASM_SPARC_PTRACE_H
 #define ___ASM_SPARC_PTRACE_H
 #if defined(__sparc__) && defined(__arch64__)
-#include <asm-sparc/ptrace_64.h>
+#include <asm/ptrace_64.h>
 #else
-#include <asm-sparc/ptrace_32.h>
+#include <asm/ptrace_32.h>
 #endif
 #endif
similarity index 66%
rename from include/asm-sparc/reg.h
rename to arch/sparc/include/asm/reg.h
index cb34b0a49aad47375066c73ed031845d64be868d..0c16e19cae4da870e1bee3a512009bb7943ebe9b 100644 (file)
@@ -1,8 +1,8 @@
 #ifndef ___ASM_SPARC_REG_H
 #define ___ASM_SPARC_REG_H
 #if defined(__sparc__) && defined(__arch64__)
-#include <asm-sparc/reg_64.h>
+#include <asm/reg_64.h>
 #else
-#include <asm-sparc/reg_32.h>
+#include <asm/reg_32.h>
 #endif
 #endif
similarity index 98%
rename from include/asm-sparc/reg_32.h
rename to arch/sparc/include/asm/reg_32.h
index 42fecfcd97e7bc92ddc3aee27b01ddcc18e0914a..1efb056fb3d15994c96214ed77ad6348fb097fe4 100644 (file)
@@ -1,5 +1,5 @@
 /*
- * linux/include/asm-sparc/reg.h
+ * linux/include/asm/reg.h
  * Layout of the registers as expected by gdb on the Sparc
  * we should replace the user.h definitions with those in
  * this file, we don't even use the other
similarity index 97%
rename from include/asm-sparc/reg_64.h
rename to arch/sparc/include/asm/reg_64.h
index eb24a07ff4d568c9d9e53fb30368e6c0e3bc039f..6f277d7c7d88f6114d5d5f2859f78a1323997d00 100644 (file)
@@ -1,5 +1,5 @@
 /*
- * linux/asm-sparc64/reg.h
+ * linux/asm/reg.h
  * Layout of the registers as expected by gdb on the Sparc
  * we should replace the user.h definitions with those in
  * this file, we don't even use the other
similarity index 66%
rename from include/asm-sparc/sbus.h
rename to arch/sparc/include/asm/sbus.h
index 8f29a19796658336930648cd958b6b3f4f2833cd..f82481ab44db043cd27314ffa30bf4268ef39e7e 100644 (file)
@@ -1,8 +1,8 @@
 #ifndef ___ASM_SPARC_SBUS_H
 #define ___ASM_SPARC_SBUS_H
 #if defined(__sparc__) && defined(__arch64__)
-#include <asm-sparc/sbus_64.h>
+#include <asm/sbus_64.h>
 #else
-#include <asm-sparc/sbus_32.h>
+#include <asm/sbus_32.h>
 #endif
 #endif
similarity index 64%
rename from include/asm-sparc/scatterlist.h
rename to arch/sparc/include/asm/scatterlist.h
index b1a0e316c2b6f762d9f26c3dd530a82caa967fd4..ec21a4517641b16b8414baab15f18a55a4363e27 100644 (file)
@@ -1,8 +1,8 @@
 #ifndef ___ASM_SPARC_SCATTERLIST_H
 #define ___ASM_SPARC_SCATTERLIST_H
 #if defined(__sparc__) && defined(__arch64__)
-#include <asm-sparc/scatterlist_64.h>
+#include <asm/scatterlist_64.h>
 #else
-#include <asm-sparc/scatterlist_32.h>
+#include <asm/scatterlist_32.h>
 #endif
 #endif
similarity index 65%
rename from include/asm-sparc/sections.h
rename to arch/sparc/include/asm/sections.h
index cbd019162425bf90b4df4ef526b7c42370513cc1..c7c69b00967ffe4fa826dcdbece00d901c1fe270 100644 (file)
@@ -1,8 +1,8 @@
 #ifndef ___ASM_SPARC_SECTIONS_H
 #define ___ASM_SPARC_SECTIONS_H
 #if defined(__sparc__) && defined(__arch64__)
-#include <asm-sparc/sections_64.h>
+#include <asm/sections_64.h>
 #else
-#include <asm-sparc/sections_32.h>
+#include <asm/sections_32.h>
 #endif
 #endif
similarity index 64%
rename from include/asm-sparc/sfp-machine.h
rename to arch/sparc/include/asm/sfp-machine.h
index c676fcc2dd277df52fe27378f00f97f91ad32706..4ebc3823ed4fec0a5fb66ad3324bedab98fe19a2 100644 (file)
@@ -1,8 +1,8 @@
 #ifndef ___ASM_SPARC_SFP_MACHINE_H
 #define ___ASM_SPARC_SFP_MACHINE_H
 #if defined(__sparc__) && defined(__arch64__)
-#include <asm-sparc/sfp-machine_64.h>
+#include <asm/sfp-machine_64.h>
 #else
-#include <asm-sparc/sfp-machine_32.h>
+#include <asm/sfp-machine_32.h>
 #endif
 #endif
similarity index 65%
rename from include/asm-sparc/shmparam.h
rename to arch/sparc/include/asm/shmparam.h
index 16fda7e9acc851c17ba99616e5c677ecceb73e46..8bf0cfe0694f8951717b8a885c415c254b77949b 100644 (file)
@@ -1,8 +1,8 @@
 #ifndef ___ASM_SPARC_SHMPARAM_H
 #define ___ASM_SPARC_SHMPARAM_H
 #if defined(__sparc__) && defined(__arch64__)
-#include <asm-sparc/shmparam_64.h>
+#include <asm/shmparam_64.h>
 #else
-#include <asm-sparc/shmparam_32.h>
+#include <asm/shmparam_32.h>
 #endif
 #endif
similarity index 64%
rename from include/asm-sparc/sigcontext.h
rename to arch/sparc/include/asm/sigcontext.h
index 82fc7d54a4fa18a55af42944c99ed6fed0d18751..e92de7e286b54dceaf41b679bef2d50a854cdadc 100644 (file)
@@ -1,8 +1,8 @@
 #ifndef ___ASM_SPARC_SIGCONTEXT_H
 #define ___ASM_SPARC_SIGCONTEXT_H
 #if defined(__sparc__) && defined(__arch64__)
-#include <asm-sparc/sigcontext_64.h>
+#include <asm/sigcontext_64.h>
 #else
-#include <asm-sparc/sigcontext_32.h>
+#include <asm/sigcontext_32.h>
 #endif
 #endif
similarity index 65%
rename from include/asm-sparc/siginfo.h
rename to arch/sparc/include/asm/siginfo.h
index 2c9fccf4ce18f65bccf3becbb1e110cc79057cc3..bd81f8d7f5ce5aff8b846f61daef596a7a342ffa 100644 (file)
@@ -1,8 +1,8 @@
 #ifndef ___ASM_SPARC_SIGINFO_H
 #define ___ASM_SPARC_SIGINFO_H
 #if defined(__sparc__) && defined(__arch64__)
-#include <asm-sparc/siginfo_64.h>
+#include <asm/siginfo_64.h>
 #else
-#include <asm-sparc/siginfo_32.h>
+#include <asm/siginfo_32.h>
 #endif
 #endif
similarity index 65%
rename from include/asm-sparc/signal.h
rename to arch/sparc/include/asm/signal.h
index 36f5f9e482f7240ad91f199d4468d114cadd8ac2..27ab05dc203e82bc838d7e9d999e7a2ea827a343 100644 (file)
@@ -1,8 +1,8 @@
 #ifndef ___ASM_SPARC_SIGNAL_H
 #define ___ASM_SPARC_SIGNAL_H
 #if defined(__sparc__) && defined(__arch64__)
-#include <asm-sparc/signal_64.h>
+#include <asm/signal_64.h>
 #else
-#include <asm-sparc/signal_32.h>
+#include <asm/signal_32.h>
 #endif
 #endif
similarity index 66%
rename from include/asm-sparc/smp.h
rename to arch/sparc/include/asm/smp.h
index 1f9dedfbabd816c0cbd8c2abb7d9d1f4e4c10e5c..b59672d0e19b6dd988fda29ad2871040e833168d 100644 (file)
@@ -1,8 +1,8 @@
 #ifndef ___ASM_SPARC_SMP_H
 #define ___ASM_SPARC_SMP_H
 #if defined(__sparc__) && defined(__arch64__)
-#include <asm-sparc/smp_64.h>
+#include <asm/smp_64.h>
 #else
-#include <asm-sparc/smp_32.h>
+#include <asm/smp_32.h>
 #endif
 #endif
similarity index 65%
rename from include/asm-sparc/spinlock.h
rename to arch/sparc/include/asm/spinlock.h
index 3b71c50b72eb10c615dc6cd3ba481433bb5352c2..f276b0036b2c4d3d547d25a2a7ff5e9722eac7af 100644 (file)
@@ -1,8 +1,8 @@
 #ifndef ___ASM_SPARC_SPINLOCK_H
 #define ___ASM_SPARC_SPINLOCK_H
 #if defined(__sparc__) && defined(__arch64__)
-#include <asm-sparc/spinlock_64.h>
+#include <asm/spinlock_64.h>
 #else
-#include <asm-sparc/spinlock_32.h>
+#include <asm/spinlock_32.h>
 #endif
 #endif
similarity index 66%
rename from include/asm-sparc/stat.h
rename to arch/sparc/include/asm/stat.h
index 9fdcaf8c9cd30b180b81bbb1dedff0f437601ac3..d8153013df7270d134416ed0ce272db68ab80cb7 100644 (file)
@@ -1,8 +1,8 @@
 #ifndef ___ASM_SPARC_STAT_H
 #define ___ASM_SPARC_STAT_H
 #if defined(__sparc__) && defined(__arch64__)
-#include <asm-sparc/stat_64.h>
+#include <asm/stat_64.h>
 #else
-#include <asm-sparc/stat_32.h>
+#include <asm/stat_32.h>
 #endif
 #endif
similarity index 65%
rename from include/asm-sparc/statfs.h
rename to arch/sparc/include/asm/statfs.h
index a70cc52e7018f6fad845c7f6d8f826924e97a7c7..5e937a73743dd85d7b830db6be254be72ed01105 100644 (file)
@@ -1,8 +1,8 @@
 #ifndef ___ASM_SPARC_STATFS_H
 #define ___ASM_SPARC_STATFS_H
 #if defined(__sparc__) && defined(__arch64__)
-#include <asm-sparc/statfs_64.h>
+#include <asm/statfs_64.h>
 #else
-#include <asm-sparc/statfs_32.h>
+#include <asm/statfs_32.h>
 #endif
 #endif
similarity index 65%
rename from include/asm-sparc/string.h
rename to arch/sparc/include/asm/string.h
index 14c04c7697a5e4b61c3bc1703409a1c477d55ca1..98b72a0c8e6e624d0ea6618e4f8ace5736369309 100644 (file)
@@ -1,8 +1,8 @@
 #ifndef ___ASM_SPARC_STRING_H
 #define ___ASM_SPARC_STRING_H
 #if defined(__sparc__) && defined(__arch64__)
-#include <asm-sparc/string_64.h>
+#include <asm/string_64.h>
 #else
-#include <asm-sparc/string_32.h>
+#include <asm/string_32.h>
 #endif
 #endif
similarity index 99%
rename from include/asm-sparc/sunbpp.h
rename to arch/sparc/include/asm/sunbpp.h
index 92ee1a8ff3a2783a248c417cb1f19198f163e814..d81a02eaf78bfc392fb0431adf40fe3b82f39fd7 100644 (file)
@@ -1,5 +1,5 @@
 /*
- * include/asm-sparc/sunbpp.h
+ * include/asm/sunbpp.h
  */
 
 #ifndef _ASM_SPARC_SUNBPP_H
similarity index 65%
rename from include/asm-sparc/system.h
rename to arch/sparc/include/asm/system.h
index 15e2a3bc4f6154f95f17a8bb2a1de37214b3a381..7944a7cfc99636032c358bfa894332fb50c07c3a 100644 (file)
@@ -1,8 +1,8 @@
 #ifndef ___ASM_SPARC_SYSTEM_H
 #define ___ASM_SPARC_SYSTEM_H
 #if defined(__sparc__) && defined(__arch64__)
-#include <asm-sparc/system_64.h>
+#include <asm/system_64.h>
 #else
-#include <asm-sparc/system_32.h>
+#include <asm/system_32.h>
 #endif
 #endif
similarity index 64%
rename from include/asm-sparc/thread_info.h
rename to arch/sparc/include/asm/thread_info.h
index 64155cf89f3706130c586bb5a0eebc2eb6ef87d8..122d7acc07e6b91519b756e9676e4dbe10c69ab9 100644 (file)
@@ -1,8 +1,8 @@
 #ifndef ___ASM_SPARC_THREAD_INFO_H
 #define ___ASM_SPARC_THREAD_INFO_H
 #if defined(__sparc__) && defined(__arch64__)
-#include <asm-sparc/thread_info_64.h>
+#include <asm/thread_info_64.h>
 #else
-#include <asm-sparc/thread_info_32.h>
+#include <asm/thread_info_32.h>
 #endif
 #endif
similarity index 65%
rename from include/asm-sparc/timer.h
rename to arch/sparc/include/asm/timer.h
index 475baa05a96eff30f0a5a71e7ac2b9b5b923b9e8..612fd2779d9eaffe78dbf590194290e14fb05a98 100644 (file)
@@ -1,8 +1,8 @@
 #ifndef ___ASM_SPARC_TIMER_H
 #define ___ASM_SPARC_TIMER_H
 #if defined(__sparc__) && defined(__arch64__)
-#include <asm-sparc/timer_64.h>
+#include <asm/timer_64.h>
 #else
-#include <asm-sparc/timer_32.h>
+#include <asm/timer_32.h>
 #endif
 #endif
similarity index 65%
rename from include/asm-sparc/timex.h
rename to arch/sparc/include/asm/timex.h
index 01d9f199d45243c1025fcbf15c48c4c79d47af01..70cc37b73827bc2fe1a3a5045326a893da6c3844 100644 (file)
@@ -1,8 +1,8 @@
 #ifndef ___ASM_SPARC_TIMEX_H
 #define ___ASM_SPARC_TIMEX_H
 #if defined(__sparc__) && defined(__arch64__)
-#include <asm-sparc/timex_64.h>
+#include <asm/timex_64.h>
 #else
-#include <asm-sparc/timex_32.h>
+#include <asm/timex_32.h>
 #endif
 #endif
similarity index 89%
rename from include/asm-sparc/timex_32.h
rename to arch/sparc/include/asm/timex_32.h
index 71b45c90ccae3d5db1959b755d5ad4e7690b386e..b6ccdb0d6f7de3fb23b8691c036be8acaa62e91f 100644 (file)
@@ -1,5 +1,5 @@
 /*
- * linux/include/asm-sparc/timex.h
+ * linux/include/asm/timex.h
  *
  * sparc architecture timex specifications
  */
similarity index 90%
rename from include/asm-sparc/timex_64.h
rename to arch/sparc/include/asm/timex_64.h
index c622535c45600bd6c9faab97b40255e71685214d..18b30bc9823b4e132d381c5d3de985f7b20c38fc 100644 (file)
@@ -1,5 +1,5 @@
 /*
- * linux/include/asm-sparc64/timex.h
+ * linux/include/asm/timex.h
  *
  * sparc64 architecture timex specifications
  */
similarity index 66%
rename from include/asm-sparc/tlb.h
rename to arch/sparc/include/asm/tlb.h
index a821057327c4994d34544d87c9aab549b40971c0..92d0393bbcdc5d16b5a0ee9308171e79bc7469a2 100644 (file)
@@ -1,8 +1,8 @@
 #ifndef ___ASM_SPARC_TLB_H
 #define ___ASM_SPARC_TLB_H
 #if defined(__sparc__) && defined(__arch64__)
-#include <asm-sparc/tlb_64.h>
+#include <asm/tlb_64.h>
 #else
-#include <asm-sparc/tlb_32.h>
+#include <asm/tlb_32.h>
 #endif
 #endif
similarity index 65%
rename from include/asm-sparc/tlbflush.h
rename to arch/sparc/include/asm/tlbflush.h
index 6e6bc12227b86f180108a1df5f26f01b07917aa6..2c9629fad1e2c33c6d33106ac53318e8ca98d94d 100644 (file)
@@ -1,8 +1,8 @@
 #ifndef ___ASM_SPARC_TLBFLUSH_H
 #define ___ASM_SPARC_TLBFLUSH_H
 #if defined(__sparc__) && defined(__arch64__)
-#include <asm-sparc/tlbflush_64.h>
+#include <asm/tlbflush_64.h>
 #else
-#include <asm-sparc/tlbflush_32.h>
+#include <asm/tlbflush_32.h>
 #endif
 #endif
similarity index 65%
rename from include/asm-sparc/topology.h
rename to arch/sparc/include/asm/topology.h
index ed13630f32e25f68057f134b4a3083ef6c668f0f..ee4f191d394aa2789e48cdd98d8f51c2d3c8d45e 100644 (file)
@@ -1,8 +1,8 @@
 #ifndef ___ASM_SPARC_TOPOLOGY_H
 #define ___ASM_SPARC_TOPOLOGY_H
 #if defined(__sparc__) && defined(__arch64__)
-#include <asm-sparc/topology_64.h>
+#include <asm/topology_64.h>
 #else
-#include <asm-sparc/topology_32.h>
+#include <asm/topology_32.h>
 #endif
 #endif
similarity index 65%
rename from include/asm-sparc/uaccess.h
rename to arch/sparc/include/asm/uaccess.h
index 424facce5238774118d29473f2a6218d8f7a5adf..e88fbe5c0457a922cd7f761d81378ac91c562703 100644 (file)
@@ -1,8 +1,8 @@
 #ifndef ___ASM_SPARC_UACCESS_H
 #define ___ASM_SPARC_UACCESS_H
 #if defined(__sparc__) && defined(__arch64__)
-#include <asm-sparc/uaccess_64.h>
+#include <asm/uaccess_64.h>
 #else
-#include <asm-sparc/uaccess_32.h>
+#include <asm/uaccess_32.h>
 #endif
 #endif
similarity index 65%
rename from include/asm-sparc/unistd.h
rename to arch/sparc/include/asm/unistd.h
index 3c2609618a099e037306190ce38ebbd56d848218..4207fb362da03e300ce2cff530ca68401560c7f7 100644 (file)
@@ -1,8 +1,8 @@
 #ifndef ___ASM_SPARC_UNISTD_H
 #define ___ASM_SPARC_UNISTD_H
 #if defined(__sparc__) && defined(__arch64__)
-#include <asm-sparc/unistd_64.h>
+#include <asm/unistd_64.h>
 #else
-#include <asm-sparc/unistd_32.h>
+#include <asm/unistd_32.h>
 #endif
 #endif
similarity index 97%
rename from include/asm-sparc/utrap.h
rename to arch/sparc/include/asm/utrap.h
index 9da37babbe5b895ca7538d0d8880bbc9e6fe9ad5..b10e527c22d967b72d1e172c3d55acef4a7ba34f 100644 (file)
@@ -1,5 +1,5 @@
 /*
- * include/asm-sparc64/utrap.h
+ * include/asm/utrap.h
  *
  * Copyright (C) 1997 Jakub Jelinek (jj@sunsite.mff.cuni.cz)
  */
similarity index 97%
rename from include/asm-sparc/vaddrs.h
rename to arch/sparc/include/asm/vaddrs.h
index a22fed5a3c6bef64d9b0d6eb75e9699e81754a68..541e13755cecb7159826de08cad615e4c091fbf8 100644 (file)
@@ -4,7 +4,7 @@
 #include <asm/head.h>
 
 /*
- * asm-sparc/vaddrs.h:  Here we define the virtual addresses at
+ * asm/vaddrs.h:  Here we define the virtual addresses at
  *                      which important things will be mapped.
  *
  * Copyright (C) 1995 David S. Miller (davem@caip.rutgers.edu)
similarity index 66%
rename from include/asm-sparc/xor.h
rename to arch/sparc/include/asm/xor.h
index 35089a838c3f9713a68d6273bcc71f8fb52e0f03..8ed591c7db2dc1ee7220e543759165895bcfa52c 100644 (file)
@@ -1,8 +1,8 @@
 #ifndef ___ASM_SPARC_XOR_H
 #define ___ASM_SPARC_XOR_H
 #if defined(__sparc__) && defined(__arch64__)
-#include <asm-sparc/xor_64.h>
+#include <asm/xor_64.h>
 #else
-#include <asm-sparc/xor_32.h>
+#include <asm/xor_32.h>
 #endif
 #endif
similarity index 99%
rename from include/asm-sparc/xor_32.h
rename to arch/sparc/include/asm/xor_32.h
index f34b2cfa82069f760ae371f16f7e1060578daa12..44bfa0787f3ffeb244b63a044e189f6e88782e8d 100644 (file)
@@ -1,5 +1,5 @@
 /*
- * include/asm-sparc/xor.h
+ * include/asm/xor.h
  *
  * Optimized RAID-5 checksumming functions for 32-bit Sparc.
  *
similarity index 98%
rename from include/asm-sparc/xor_64.h
rename to arch/sparc/include/asm/xor_64.h
index a0233884fc94c6084045b7db829c849ba9a06f24..bee4bf4be3af8cb4a41df1554252381eaddf952b 100644 (file)
@@ -1,5 +1,5 @@
 /*
- * include/asm-sparc64/xor.h
+ * include/asm/xor.h
  *
  * High speed xor_block operation for RAID4/5 utilizing the
  * UltraSparc Visual Instruction Set and Niagara block-init
index c1979482aa929bbf85db4a97ca7138365b35bda6..c831b0a4e660b69d1221230a2d5460db62459fef 100644 (file)
@@ -1,4 +1,4 @@
-#include <asm-sparc/unistd.h>
+#include <asm/unistd_32.h>
 
 unsigned sparc32_dir_class[] = {
 #include <asm-generic/audit_dir_write.h>
diff --git a/include/asm-sparc64/Kbuild b/include/asm-sparc64/Kbuild
deleted file mode 100644 (file)
index 6cdaf9d..0000000
+++ /dev/null
@@ -1 +0,0 @@
-# dummy file to avoid breaking make headers_install
diff --git a/include/asm-sparc64/agp.h b/include/asm-sparc64/agp.h
deleted file mode 100644 (file)
index eb8d4b3..0000000
+++ /dev/null
@@ -1 +0,0 @@
-#include <asm-sparc/agp.h>
diff --git a/include/asm-sparc64/apb.h b/include/asm-sparc64/apb.h
deleted file mode 100644 (file)
index 5e236ca..0000000
+++ /dev/null
@@ -1 +0,0 @@
-#include <asm-sparc/apb.h>
diff --git a/include/asm-sparc64/asi.h b/include/asm-sparc64/asi.h
deleted file mode 100644 (file)
index 9b7110c..0000000
+++ /dev/null
@@ -1 +0,0 @@
-#include <asm-sparc/asi.h>
diff --git a/include/asm-sparc64/atomic.h b/include/asm-sparc64/atomic.h
deleted file mode 100644 (file)
index f512682..0000000
+++ /dev/null
@@ -1 +0,0 @@
-#include <asm-sparc/atomic.h>
diff --git a/include/asm-sparc64/auxio.h b/include/asm-sparc64/auxio.h
deleted file mode 100644 (file)
index 46c9042..0000000
+++ /dev/null
@@ -1 +0,0 @@
-#include <asm-sparc/auxio.h>
diff --git a/include/asm-sparc64/auxvec.h b/include/asm-sparc64/auxvec.h
deleted file mode 100644 (file)
index 1f45c67..0000000
+++ /dev/null
@@ -1 +0,0 @@
-#include <asm-sparc/auxvec.h>
diff --git a/include/asm-sparc64/backoff.h b/include/asm-sparc64/backoff.h
deleted file mode 100644 (file)
index 8ee26d9..0000000
+++ /dev/null
@@ -1 +0,0 @@
-#include <asm-sparc/backoff.h>
diff --git a/include/asm-sparc64/bbc.h b/include/asm-sparc64/bbc.h
deleted file mode 100644 (file)
index 06e8b63..0000000
+++ /dev/null
@@ -1 +0,0 @@
-#include <asm-sparc/bbc.h>
diff --git a/include/asm-sparc64/bitops.h b/include/asm-sparc64/bitops.h
deleted file mode 100644 (file)
index 2044043..0000000
+++ /dev/null
@@ -1 +0,0 @@
-#include <asm-sparc/bitops.h>
diff --git a/include/asm-sparc64/bpp.h b/include/asm-sparc64/bpp.h
deleted file mode 100644 (file)
index 514eee2..0000000
+++ /dev/null
@@ -1 +0,0 @@
-#include <asm-sparc/bpp.h>
diff --git a/include/asm-sparc64/bug.h b/include/asm-sparc64/bug.h
deleted file mode 100644 (file)
index 3433737..0000000
+++ /dev/null
@@ -1 +0,0 @@
-#include <asm-sparc/bug.h>
diff --git a/include/asm-sparc64/bugs.h b/include/asm-sparc64/bugs.h
deleted file mode 100644 (file)
index 04ae9e2..0000000
+++ /dev/null
@@ -1 +0,0 @@
-#include <asm-sparc/bugs.h>
diff --git a/include/asm-sparc64/byteorder.h b/include/asm-sparc64/byteorder.h
deleted file mode 100644 (file)
index f672855..0000000
+++ /dev/null
@@ -1 +0,0 @@
-#include <asm-sparc/byteorder.h>
diff --git a/include/asm-sparc64/cache.h b/include/asm-sparc64/cache.h
deleted file mode 100644 (file)
index fa9de5c..0000000
+++ /dev/null
@@ -1 +0,0 @@
-#include <asm-sparc/cache.h>
diff --git a/include/asm-sparc64/cacheflush.h b/include/asm-sparc64/cacheflush.h
deleted file mode 100644 (file)
index cf5b6b3..0000000
+++ /dev/null
@@ -1 +0,0 @@
-#include <asm-sparc/cacheflush.h>
diff --git a/include/asm-sparc64/chafsr.h b/include/asm-sparc64/chafsr.h
deleted file mode 100644 (file)
index aaab975..0000000
+++ /dev/null
@@ -1 +0,0 @@
-#include <asm-sparc/chafsr.h>
diff --git a/include/asm-sparc64/checksum.h b/include/asm-sparc64/checksum.h
deleted file mode 100644 (file)
index c3966c5..0000000
+++ /dev/null
@@ -1 +0,0 @@
-#include <asm-sparc/checksum.h>
diff --git a/include/asm-sparc64/chmctrl.h b/include/asm-sparc64/chmctrl.h
deleted file mode 100644 (file)
index eb757b4..0000000
+++ /dev/null
@@ -1 +0,0 @@
-#include <asm-sparc/chmctrl.h>
diff --git a/include/asm-sparc64/cmt.h b/include/asm-sparc64/cmt.h
deleted file mode 100644 (file)
index b19b445..0000000
+++ /dev/null
@@ -1 +0,0 @@
-#include <asm-sparc/cmt.h>
diff --git a/include/asm-sparc64/compat.h b/include/asm-sparc64/compat.h
deleted file mode 100644 (file)
index 8c155d2..0000000
+++ /dev/null
@@ -1 +0,0 @@
-#include <asm-sparc/compat.h>
diff --git a/include/asm-sparc64/compat_signal.h b/include/asm-sparc64/compat_signal.h
deleted file mode 100644 (file)
index 7187dcc..0000000
+++ /dev/null
@@ -1 +0,0 @@
-#include <asm-sparc/compat_signal.h>
diff --git a/include/asm-sparc64/cpudata.h b/include/asm-sparc64/cpudata.h
deleted file mode 100644 (file)
index 3220e13..0000000
+++ /dev/null
@@ -1 +0,0 @@
-#include <asm-sparc/cpudata.h>
diff --git a/include/asm-sparc64/cputime.h b/include/asm-sparc64/cputime.h
deleted file mode 100644 (file)
index 435f37a..0000000
+++ /dev/null
@@ -1 +0,0 @@
-#include <asm-sparc/cputime.h>
diff --git a/include/asm-sparc64/current.h b/include/asm-sparc64/current.h
deleted file mode 100644 (file)
index a7904a7..0000000
+++ /dev/null
@@ -1 +0,0 @@
-#include <asm-sparc/current.h>
diff --git a/include/asm-sparc64/dcr.h b/include/asm-sparc64/dcr.h
deleted file mode 100644 (file)
index d67613b..0000000
+++ /dev/null
@@ -1 +0,0 @@
-#include <asm-sparc/dcr.h>
diff --git a/include/asm-sparc64/dcu.h b/include/asm-sparc64/dcu.h
deleted file mode 100644 (file)
index 28853f4..0000000
+++ /dev/null
@@ -1 +0,0 @@
-#include <asm-sparc/dcu.h>
diff --git a/include/asm-sparc64/delay.h b/include/asm-sparc64/delay.h
deleted file mode 100644 (file)
index 33dc558..0000000
+++ /dev/null
@@ -1 +0,0 @@
-#include <asm-sparc/delay.h>
diff --git a/include/asm-sparc64/device.h b/include/asm-sparc64/device.h
deleted file mode 100644 (file)
index 4145c47..0000000
+++ /dev/null
@@ -1 +0,0 @@
-#include <asm-sparc/device.h>
diff --git a/include/asm-sparc64/display7seg.h b/include/asm-sparc64/display7seg.h
deleted file mode 100644 (file)
index e74f046..0000000
+++ /dev/null
@@ -1 +0,0 @@
-#include <asm-sparc/display7seg.h>
diff --git a/include/asm-sparc64/div64.h b/include/asm-sparc64/div64.h
deleted file mode 100644 (file)
index 928c94f..0000000
+++ /dev/null
@@ -1 +0,0 @@
-#include <asm-sparc/div64.h>
diff --git a/include/asm-sparc64/dma-mapping.h b/include/asm-sparc64/dma-mapping.h
deleted file mode 100644 (file)
index 380b7b6..0000000
+++ /dev/null
@@ -1 +0,0 @@
-#include <asm-sparc/dma-mapping.h>
diff --git a/include/asm-sparc64/dma.h b/include/asm-sparc64/dma.h
deleted file mode 100644 (file)
index 2e36248..0000000
+++ /dev/null
@@ -1 +0,0 @@
-#include <asm-sparc/dma.h>
diff --git a/include/asm-sparc64/ebus.h b/include/asm-sparc64/ebus.h
deleted file mode 100644 (file)
index d7d4761..0000000
+++ /dev/null
@@ -1 +0,0 @@
-#include <asm-sparc/ebus.h>
diff --git a/include/asm-sparc64/elf.h b/include/asm-sparc64/elf.h
deleted file mode 100644 (file)
index f256d94..0000000
+++ /dev/null
@@ -1 +0,0 @@
-#include <asm-sparc/elf.h>
diff --git a/include/asm-sparc64/emergency-restart.h b/include/asm-sparc64/emergency-restart.h
deleted file mode 100644 (file)
index 2cac7b6..0000000
+++ /dev/null
@@ -1 +0,0 @@
-#include <asm-sparc/emergency-restart.h>
diff --git a/include/asm-sparc64/envctrl.h b/include/asm-sparc64/envctrl.h
deleted file mode 100644 (file)
index a2cc0ca..0000000
+++ /dev/null
@@ -1 +0,0 @@
-#include <asm-sparc/envctrl.h>
diff --git a/include/asm-sparc64/errno.h b/include/asm-sparc64/errno.h
deleted file mode 100644 (file)
index 9701fe0..0000000
+++ /dev/null
@@ -1 +0,0 @@
-#include <asm-sparc/errno.h>
diff --git a/include/asm-sparc64/estate.h b/include/asm-sparc64/estate.h
deleted file mode 100644 (file)
index bedd0ef..0000000
+++ /dev/null
@@ -1 +0,0 @@
-#include <asm-sparc/estate.h>
diff --git a/include/asm-sparc64/fb.h b/include/asm-sparc64/fb.h
deleted file mode 100644 (file)
index 1c2ac58..0000000
+++ /dev/null
@@ -1 +0,0 @@
-#include <asm-sparc/fb.h>
diff --git a/include/asm-sparc64/fbio.h b/include/asm-sparc64/fbio.h
deleted file mode 100644 (file)
index c17edf8..0000000
+++ /dev/null
@@ -1 +0,0 @@
-#include <asm-sparc/fbio.h>
diff --git a/include/asm-sparc64/fcntl.h b/include/asm-sparc64/fcntl.h
deleted file mode 100644 (file)
index 8b1beae..0000000
+++ /dev/null
@@ -1 +0,0 @@
-#include <asm-sparc/fcntl.h>
diff --git a/include/asm-sparc64/fhc.h b/include/asm-sparc64/fhc.h
deleted file mode 100644 (file)
index 73eb04c..0000000
+++ /dev/null
@@ -1 +0,0 @@
-#include <asm-sparc/fhc.h>
diff --git a/include/asm-sparc64/floppy.h b/include/asm-sparc64/floppy.h
deleted file mode 100644 (file)
index 2148781..0000000
+++ /dev/null
@@ -1 +0,0 @@
-#include <asm-sparc/floppy.h>
diff --git a/include/asm-sparc64/fpumacro.h b/include/asm-sparc64/fpumacro.h
deleted file mode 100644 (file)
index 30d6d0f..0000000
+++ /dev/null
@@ -1 +0,0 @@
-#include <asm-sparc/fpumacro.h>
diff --git a/include/asm-sparc64/futex.h b/include/asm-sparc64/futex.h
deleted file mode 100644 (file)
index 1ceb0bb..0000000
+++ /dev/null
@@ -1 +0,0 @@
-#include <asm-sparc/futex.h>
diff --git a/include/asm-sparc64/hardirq.h b/include/asm-sparc64/hardirq.h
deleted file mode 100644 (file)
index 63dca3d..0000000
+++ /dev/null
@@ -1 +0,0 @@
-#include <asm-sparc/hardirq.h>
diff --git a/include/asm-sparc64/head.h b/include/asm-sparc64/head.h
deleted file mode 100644 (file)
index 2254c09..0000000
+++ /dev/null
@@ -1 +0,0 @@
-#include <asm-sparc/head.h>
diff --git a/include/asm-sparc64/hugetlb.h b/include/asm-sparc64/hugetlb.h
deleted file mode 100644 (file)
index 21d8f0a..0000000
+++ /dev/null
@@ -1 +0,0 @@
-#include <asm-sparc/hugetlb.h>
diff --git a/include/asm-sparc64/hvtramp.h b/include/asm-sparc64/hvtramp.h
deleted file mode 100644 (file)
index fb46bfe..0000000
+++ /dev/null
@@ -1 +0,0 @@
-#include <asm-sparc/hvtramp.h>
diff --git a/include/asm-sparc64/hw_irq.h b/include/asm-sparc64/hw_irq.h
deleted file mode 100644 (file)
index 16920a2..0000000
+++ /dev/null
@@ -1 +0,0 @@
-#include <asm-sparc/hw_irq.h>
diff --git a/include/asm-sparc64/hypervisor.h b/include/asm-sparc64/hypervisor.h
deleted file mode 100644 (file)
index fe7e51a..0000000
+++ /dev/null
@@ -1 +0,0 @@
-#include <asm-sparc/hypervisor.h>
diff --git a/include/asm-sparc64/ide.h b/include/asm-sparc64/ide.h
deleted file mode 100644 (file)
index 7125317..0000000
+++ /dev/null
@@ -1 +0,0 @@
-#include <asm-sparc/ide.h>
diff --git a/include/asm-sparc64/idprom.h b/include/asm-sparc64/idprom.h
deleted file mode 100644 (file)
index c22f9c3..0000000
+++ /dev/null
@@ -1 +0,0 @@
-#include <asm-sparc/idprom.h>
diff --git a/include/asm-sparc64/intr_queue.h b/include/asm-sparc64/intr_queue.h
deleted file mode 100644 (file)
index f722501..0000000
+++ /dev/null
@@ -1 +0,0 @@
-#include <asm-sparc/intr_queue.h>
diff --git a/include/asm-sparc64/io.h b/include/asm-sparc64/io.h
deleted file mode 100644 (file)
index 25ff258..0000000
+++ /dev/null
@@ -1 +0,0 @@
-#include <asm-sparc/io.h>
diff --git a/include/asm-sparc64/ioctl.h b/include/asm-sparc64/ioctl.h
deleted file mode 100644 (file)
index 18fc562..0000000
+++ /dev/null
@@ -1 +0,0 @@
-#include <asm-sparc/ioctl.h>
diff --git a/include/asm-sparc64/ioctls.h b/include/asm-sparc64/ioctls.h
deleted file mode 100644 (file)
index dcd5540..0000000
+++ /dev/null
@@ -1 +0,0 @@
-#include <asm-sparc/ioctls.h>
diff --git a/include/asm-sparc64/iommu.h b/include/asm-sparc64/iommu.h
deleted file mode 100644 (file)
index 76252bb..0000000
+++ /dev/null
@@ -1 +0,0 @@
-#include <asm-sparc/iommu.h>
diff --git a/include/asm-sparc64/ipcbuf.h b/include/asm-sparc64/ipcbuf.h
deleted file mode 100644 (file)
index 41dfaf1..0000000
+++ /dev/null
@@ -1 +0,0 @@
-#include <asm-sparc/ipcbuf.h>
diff --git a/include/asm-sparc64/irq.h b/include/asm-sparc64/irq.h
deleted file mode 100644 (file)
index b2102e6..0000000
+++ /dev/null
@@ -1 +0,0 @@
-#include <asm-sparc/irq.h>
diff --git a/include/asm-sparc64/irq_regs.h b/include/asm-sparc64/irq_regs.h
deleted file mode 100644 (file)
index 1e2b8a1..0000000
+++ /dev/null
@@ -1 +0,0 @@
-#include <asm-sparc/irq_regs.h>
diff --git a/include/asm-sparc64/irqflags.h b/include/asm-sparc64/irqflags.h
deleted file mode 100644 (file)
index 27b091f..0000000
+++ /dev/null
@@ -1 +0,0 @@
-#include <asm-sparc/irqflags.h>
diff --git a/include/asm-sparc64/kdebug.h b/include/asm-sparc64/kdebug.h
deleted file mode 100644 (file)
index 78cfd5d..0000000
+++ /dev/null
@@ -1 +0,0 @@
-#include <asm-sparc/kdebug.h>
diff --git a/include/asm-sparc64/kgdb.h b/include/asm-sparc64/kgdb.h
deleted file mode 100644 (file)
index aa6532f..0000000
+++ /dev/null
@@ -1 +0,0 @@
-#include <asm-sparc/kgdb.h>
diff --git a/include/asm-sparc64/kmap_types.h b/include/asm-sparc64/kmap_types.h
deleted file mode 100644 (file)
index 276530c..0000000
+++ /dev/null
@@ -1 +0,0 @@
-#include <asm-sparc/kmap_types.h>
diff --git a/include/asm-sparc64/kprobes.h b/include/asm-sparc64/kprobes.h
deleted file mode 100644 (file)
index c55e43e..0000000
+++ /dev/null
@@ -1 +0,0 @@
-#include <asm-sparc/kprobes.h>
diff --git a/include/asm-sparc64/ldc.h b/include/asm-sparc64/ldc.h
deleted file mode 100644 (file)
index 40f3f23..0000000
+++ /dev/null
@@ -1 +0,0 @@
-#include <asm-sparc/ldc.h>
diff --git a/include/asm-sparc64/linkage.h b/include/asm-sparc64/linkage.h
deleted file mode 100644 (file)
index 3ea4fd1..0000000
+++ /dev/null
@@ -1 +0,0 @@
-#include <asm-sparc/linkage.h>
diff --git a/include/asm-sparc64/lmb.h b/include/asm-sparc64/lmb.h
deleted file mode 100644 (file)
index 3d04981..0000000
+++ /dev/null
@@ -1 +0,0 @@
-#include <asm-sparc/lmb.h>
diff --git a/include/asm-sparc64/local.h b/include/asm-sparc64/local.h
deleted file mode 100644 (file)
index c11c530..0000000
+++ /dev/null
@@ -1 +0,0 @@
-#include <asm-generic/local.h>
diff --git a/include/asm-sparc64/lsu.h b/include/asm-sparc64/lsu.h
deleted file mode 100644 (file)
index 4e3d8b1..0000000
+++ /dev/null
@@ -1 +0,0 @@
-#include <asm-sparc/lsu.h>
diff --git a/include/asm-sparc64/mc146818rtc.h b/include/asm-sparc64/mc146818rtc.h
deleted file mode 100644 (file)
index 97842e6..0000000
+++ /dev/null
@@ -1 +0,0 @@
-#include <asm-sparc/mc146818rtc.h>
diff --git a/include/asm-sparc64/mdesc.h b/include/asm-sparc64/mdesc.h
deleted file mode 100644 (file)
index 165a193..0000000
+++ /dev/null
@@ -1 +0,0 @@
-#include <asm-sparc/mdesc.h>
diff --git a/include/asm-sparc64/mman.h b/include/asm-sparc64/mman.h
deleted file mode 100644 (file)
index 17ddb17..0000000
+++ /dev/null
@@ -1 +0,0 @@
-#include <asm-sparc/mman.h>
diff --git a/include/asm-sparc64/mmu.h b/include/asm-sparc64/mmu.h
deleted file mode 100644 (file)
index e677a64..0000000
+++ /dev/null
@@ -1 +0,0 @@
-#include <asm-sparc/mmu.h>
diff --git a/include/asm-sparc64/mmu_context.h b/include/asm-sparc64/mmu_context.h
deleted file mode 100644 (file)
index 877fee9..0000000
+++ /dev/null
@@ -1 +0,0 @@
-#include <asm-sparc/mmu_context.h>
diff --git a/include/asm-sparc64/mmzone.h b/include/asm-sparc64/mmzone.h
deleted file mode 100644 (file)
index 43a710f..0000000
+++ /dev/null
@@ -1 +0,0 @@
-#include <asm-sparc/mmzone.h>
diff --git a/include/asm-sparc64/module.h b/include/asm-sparc64/module.h
deleted file mode 100644 (file)
index a9606db..0000000
+++ /dev/null
@@ -1 +0,0 @@
-#include <asm-sparc/module.h>
diff --git a/include/asm-sparc64/mostek.h b/include/asm-sparc64/mostek.h
deleted file mode 100644 (file)
index 95a752f..0000000
+++ /dev/null
@@ -1 +0,0 @@
-#include <asm-sparc/mostek.h>
diff --git a/include/asm-sparc64/msgbuf.h b/include/asm-sparc64/msgbuf.h
deleted file mode 100644 (file)
index 5b33cc9..0000000
+++ /dev/null
@@ -1 +0,0 @@
-#include <asm-sparc/msgbuf.h>
diff --git a/include/asm-sparc64/mutex.h b/include/asm-sparc64/mutex.h
deleted file mode 100644 (file)
index c0c0f8f..0000000
+++ /dev/null
@@ -1 +0,0 @@
-#include <asm-sparc/mutex.h>
diff --git a/include/asm-sparc64/ns87303.h b/include/asm-sparc64/ns87303.h
deleted file mode 100644 (file)
index 5f369d4..0000000
+++ /dev/null
@@ -1 +0,0 @@
-#include <asm-sparc/ns87303.h>
diff --git a/include/asm-sparc64/of_device.h b/include/asm-sparc64/of_device.h
deleted file mode 100644 (file)
index a769fdb..0000000
+++ /dev/null
@@ -1 +0,0 @@
-#include <asm-sparc/of_device.h>
diff --git a/include/asm-sparc64/of_platform.h b/include/asm-sparc64/of_platform.h
deleted file mode 100644 (file)
index f7c427b..0000000
+++ /dev/null
@@ -1 +0,0 @@
-#include <asm-sparc/of_platform.h>
diff --git a/include/asm-sparc64/openprom.h b/include/asm-sparc64/openprom.h
deleted file mode 100644 (file)
index acf4b23..0000000
+++ /dev/null
@@ -1 +0,0 @@
-#include <asm-sparc/openprom.h>
diff --git a/include/asm-sparc64/openpromio.h b/include/asm-sparc64/openpromio.h
deleted file mode 100644 (file)
index 122fabd..0000000
+++ /dev/null
@@ -1 +0,0 @@
-#include <asm-sparc/openpromio.h>
diff --git a/include/asm-sparc64/oplib.h b/include/asm-sparc64/oplib.h
deleted file mode 100644 (file)
index d93e44e..0000000
+++ /dev/null
@@ -1 +0,0 @@
-#include <asm-sparc/oplib.h>
diff --git a/include/asm-sparc64/page.h b/include/asm-sparc64/page.h
deleted file mode 100644 (file)
index f46c1fb..0000000
+++ /dev/null
@@ -1 +0,0 @@
-#include <asm-sparc/page.h>
diff --git a/include/asm-sparc64/param.h b/include/asm-sparc64/param.h
deleted file mode 100644 (file)
index 40c6dc1..0000000
+++ /dev/null
@@ -1 +0,0 @@
-#include <asm-sparc/param.h>
diff --git a/include/asm-sparc64/parport.h b/include/asm-sparc64/parport.h
deleted file mode 100644 (file)
index b4e4ca8..0000000
+++ /dev/null
@@ -1 +0,0 @@
-#include <asm-sparc/parport.h>
diff --git a/include/asm-sparc64/pci.h b/include/asm-sparc64/pci.h
deleted file mode 100644 (file)
index da54c4d..0000000
+++ /dev/null
@@ -1 +0,0 @@
-#include <asm-sparc/pci.h>
diff --git a/include/asm-sparc64/percpu.h b/include/asm-sparc64/percpu.h
deleted file mode 100644 (file)
index 292729b..0000000
+++ /dev/null
@@ -1 +0,0 @@
-#include <asm-sparc/percpu.h>
diff --git a/include/asm-sparc64/perfctr.h b/include/asm-sparc64/perfctr.h
deleted file mode 100644 (file)
index 52073a9..0000000
+++ /dev/null
@@ -1 +0,0 @@
-#include <asm-sparc/perfctr.h>
diff --git a/include/asm-sparc64/pgalloc.h b/include/asm-sparc64/pgalloc.h
deleted file mode 100644 (file)
index bec3164..0000000
+++ /dev/null
@@ -1 +0,0 @@
-#include <asm-sparc/pgalloc.h>
diff --git a/include/asm-sparc64/pgtable.h b/include/asm-sparc64/pgtable.h
deleted file mode 100644 (file)
index 9decbd9..0000000
+++ /dev/null
@@ -1 +0,0 @@
-#include <asm-sparc/pgtable.h>
diff --git a/include/asm-sparc64/pil.h b/include/asm-sparc64/pil.h
deleted file mode 100644 (file)
index d805f33..0000000
+++ /dev/null
@@ -1 +0,0 @@
-#include <asm-sparc/pil.h>
diff --git a/include/asm-sparc64/poll.h b/include/asm-sparc64/poll.h
deleted file mode 100644 (file)
index 8e2f31b..0000000
+++ /dev/null
@@ -1 +0,0 @@
-#include <asm-sparc/poll.h>
diff --git a/include/asm-sparc64/posix_types.h b/include/asm-sparc64/posix_types.h
deleted file mode 100644 (file)
index 8cee992..0000000
+++ /dev/null
@@ -1 +0,0 @@
-#include <asm-sparc/posix_types.h>
diff --git a/include/asm-sparc64/processor.h b/include/asm-sparc64/processor.h
deleted file mode 100644 (file)
index 21de6cc..0000000
+++ /dev/null
@@ -1 +0,0 @@
-#include <asm-sparc/processor.h>
diff --git a/include/asm-sparc64/prom.h b/include/asm-sparc64/prom.h
deleted file mode 100644 (file)
index 5fa166e..0000000
+++ /dev/null
@@ -1 +0,0 @@
-#include <asm-sparc/prom.h>
diff --git a/include/asm-sparc64/psrcompat.h b/include/asm-sparc64/psrcompat.h
deleted file mode 100644 (file)
index 587846f..0000000
+++ /dev/null
@@ -1 +0,0 @@
-#include <asm-sparc/psrcompat.h>
diff --git a/include/asm-sparc64/pstate.h b/include/asm-sparc64/pstate.h
deleted file mode 100644 (file)
index 3ccf0be..0000000
+++ /dev/null
@@ -1 +0,0 @@
-#include <asm-sparc/pstate.h>
diff --git a/include/asm-sparc64/ptrace.h b/include/asm-sparc64/ptrace.h
deleted file mode 100644 (file)
index 1a55b9f..0000000
+++ /dev/null
@@ -1 +0,0 @@
-#include <asm-sparc/ptrace.h>
diff --git a/include/asm-sparc64/reboot.h b/include/asm-sparc64/reboot.h
deleted file mode 100644 (file)
index 0d72eb8..0000000
+++ /dev/null
@@ -1 +0,0 @@
-#include <asm-sparc/reboot.h>
diff --git a/include/asm-sparc64/reg.h b/include/asm-sparc64/reg.h
deleted file mode 100644 (file)
index 495bab2..0000000
+++ /dev/null
@@ -1 +0,0 @@
-#include <asm-sparc/reg.h>
diff --git a/include/asm-sparc64/resource.h b/include/asm-sparc64/resource.h
deleted file mode 100644 (file)
index 46e3bc0..0000000
+++ /dev/null
@@ -1 +0,0 @@
-#include <asm-sparc/resource.h>
diff --git a/include/asm-sparc64/rtc.h b/include/asm-sparc64/rtc.h
deleted file mode 100644 (file)
index e49a968..0000000
+++ /dev/null
@@ -1 +0,0 @@
-#include <asm-sparc/rtc.h>
diff --git a/include/asm-sparc64/rwsem-const.h b/include/asm-sparc64/rwsem-const.h
deleted file mode 100644 (file)
index 2a1de31..0000000
+++ /dev/null
@@ -1 +0,0 @@
-#include <asm-sparc/rwsem-const.h>
diff --git a/include/asm-sparc64/rwsem.h b/include/asm-sparc64/rwsem.h
deleted file mode 100644 (file)
index 6943c56..0000000
+++ /dev/null
@@ -1 +0,0 @@
-#include <asm-sparc/rwsem.h>
diff --git a/include/asm-sparc64/sbus.h b/include/asm-sparc64/sbus.h
deleted file mode 100644 (file)
index 0cab0e8..0000000
+++ /dev/null
@@ -1 +0,0 @@
-#include <asm-sparc/sbus.h>
diff --git a/include/asm-sparc64/scatterlist.h b/include/asm-sparc64/scatterlist.h
deleted file mode 100644 (file)
index b7fef95..0000000
+++ /dev/null
@@ -1 +0,0 @@
-#include <asm-sparc/scatterlist.h>
diff --git a/include/asm-sparc64/scratchpad.h b/include/asm-sparc64/scratchpad.h
deleted file mode 100644 (file)
index 23675f6..0000000
+++ /dev/null
@@ -1 +0,0 @@
-#include <asm-sparc/scratchpad.h>
diff --git a/include/asm-sparc64/seccomp.h b/include/asm-sparc64/seccomp.h
deleted file mode 100644 (file)
index f22f02a..0000000
+++ /dev/null
@@ -1 +0,0 @@
-#include <asm-sparc/seccomp.h>
diff --git a/include/asm-sparc64/sections.h b/include/asm-sparc64/sections.h
deleted file mode 100644 (file)
index 721496f..0000000
+++ /dev/null
@@ -1 +0,0 @@
-#include <asm-sparc/sections.h>
diff --git a/include/asm-sparc64/sembuf.h b/include/asm-sparc64/sembuf.h
deleted file mode 100644 (file)
index c55b952..0000000
+++ /dev/null
@@ -1 +0,0 @@
-#include <asm-sparc/sembuf.h>
diff --git a/include/asm-sparc64/setup.h b/include/asm-sparc64/setup.h
deleted file mode 100644 (file)
index 7143d06..0000000
+++ /dev/null
@@ -1 +0,0 @@
-#include <asm-sparc/setup.h>
diff --git a/include/asm-sparc64/sfafsr.h b/include/asm-sparc64/sfafsr.h
deleted file mode 100644 (file)
index 8036fc3..0000000
+++ /dev/null
@@ -1 +0,0 @@
-#include <asm-sparc/sfafsr.h>
diff --git a/include/asm-sparc64/sfp-machine.h b/include/asm-sparc64/sfp-machine.h
deleted file mode 100644 (file)
index 7bbc4fe..0000000
+++ /dev/null
@@ -1 +0,0 @@
-#include <asm-sparc/sfp-machine.h>
diff --git a/include/asm-sparc64/shmbuf.h b/include/asm-sparc64/shmbuf.h
deleted file mode 100644 (file)
index 0c54a2d..0000000
+++ /dev/null
@@ -1 +0,0 @@
-#include <asm-sparc/shmbuf.h>
diff --git a/include/asm-sparc64/shmparam.h b/include/asm-sparc64/shmparam.h
deleted file mode 100644 (file)
index 5fa3a9b..0000000
+++ /dev/null
@@ -1 +0,0 @@
-#include <asm-sparc/shmparam.h>
diff --git a/include/asm-sparc64/sigcontext.h b/include/asm-sparc64/sigcontext.h
deleted file mode 100644 (file)
index 5b16dcc..0000000
+++ /dev/null
@@ -1 +0,0 @@
-#include <asm-sparc/sigcontext.h>
diff --git a/include/asm-sparc64/siginfo.h b/include/asm-sparc64/siginfo.h
deleted file mode 100644 (file)
index 8ffd6eb..0000000
+++ /dev/null
@@ -1 +0,0 @@
-#include <asm-sparc/siginfo.h>
diff --git a/include/asm-sparc64/signal.h b/include/asm-sparc64/signal.h
deleted file mode 100644 (file)
index 79705e5..0000000
+++ /dev/null
@@ -1 +0,0 @@
-#include <asm-sparc/signal.h>
diff --git a/include/asm-sparc64/smp.h b/include/asm-sparc64/smp.h
deleted file mode 100644 (file)
index 5095a2c..0000000
+++ /dev/null
@@ -1 +0,0 @@
-#include <asm-sparc/smp.h>
diff --git a/include/asm-sparc64/socket.h b/include/asm-sparc64/socket.h
deleted file mode 100644 (file)
index 13e0d5d..0000000
+++ /dev/null
@@ -1 +0,0 @@
-#include <asm-sparc/socket.h>
diff --git a/include/asm-sparc64/sockios.h b/include/asm-sparc64/sockios.h
deleted file mode 100644 (file)
index 2cb4b64..0000000
+++ /dev/null
@@ -1 +0,0 @@
-#include <asm-sparc/sockios.h>
diff --git a/include/asm-sparc64/sparsemem.h b/include/asm-sparc64/sparsemem.h
deleted file mode 100644 (file)
index e681f22..0000000
+++ /dev/null
@@ -1 +0,0 @@
-#include <asm-sparc/sparsemem.h>
diff --git a/include/asm-sparc64/spinlock.h b/include/asm-sparc64/spinlock.h
deleted file mode 100644 (file)
index 0115b81..0000000
+++ /dev/null
@@ -1 +0,0 @@
-#include <asm-sparc/spinlock.h>
diff --git a/include/asm-sparc64/spinlock_types.h b/include/asm-sparc64/spinlock_types.h
deleted file mode 100644 (file)
index 48d81c8..0000000
+++ /dev/null
@@ -1 +0,0 @@
-#include <asm-sparc/spinlock_types.h>
diff --git a/include/asm-sparc64/spitfire.h b/include/asm-sparc64/spitfire.h
deleted file mode 100644 (file)
index 4430d2f..0000000
+++ /dev/null
@@ -1 +0,0 @@
-#include <asm-sparc/spitfire.h>
diff --git a/include/asm-sparc64/sstate.h b/include/asm-sparc64/sstate.h
deleted file mode 100644 (file)
index 97720ce..0000000
+++ /dev/null
@@ -1 +0,0 @@
-#include <asm-sparc/sstate.h>
diff --git a/include/asm-sparc64/stacktrace.h b/include/asm-sparc64/stacktrace.h
deleted file mode 100644 (file)
index adc9b92..0000000
+++ /dev/null
@@ -1 +0,0 @@
-#include <asm-sparc/stacktrace.h>
diff --git a/include/asm-sparc64/starfire.h b/include/asm-sparc64/starfire.h
deleted file mode 100644 (file)
index db97daa..0000000
+++ /dev/null
@@ -1 +0,0 @@
-#include <asm-sparc/starfire.h>
diff --git a/include/asm-sparc64/stat.h b/include/asm-sparc64/stat.h
deleted file mode 100644 (file)
index b108a86..0000000
+++ /dev/null
@@ -1 +0,0 @@
-#include <asm-sparc/stat.h>
diff --git a/include/asm-sparc64/statfs.h b/include/asm-sparc64/statfs.h
deleted file mode 100644 (file)
index 5503d6a..0000000
+++ /dev/null
@@ -1 +0,0 @@
-#include <asm-sparc/statfs.h>
diff --git a/include/asm-sparc64/string.h b/include/asm-sparc64/string.h
deleted file mode 100644 (file)
index 5018cd8..0000000
+++ /dev/null
@@ -1 +0,0 @@
-#include <asm-sparc/string.h>
diff --git a/include/asm-sparc64/sunbpp.h b/include/asm-sparc64/sunbpp.h
deleted file mode 100644 (file)
index 9632be2..0000000
+++ /dev/null
@@ -1 +0,0 @@
-#include <asm-sparc/sunbpp.h>
diff --git a/include/asm-sparc64/syscalls.h b/include/asm-sparc64/syscalls.h
deleted file mode 100644 (file)
index 3477b16..0000000
+++ /dev/null
@@ -1 +0,0 @@
-#include <asm-sparc/syscalls.h>
diff --git a/include/asm-sparc64/system.h b/include/asm-sparc64/system.h
deleted file mode 100644 (file)
index be2603c..0000000
+++ /dev/null
@@ -1 +0,0 @@
-#include <asm-sparc/system.h>
diff --git a/include/asm-sparc64/termbits.h b/include/asm-sparc64/termbits.h
deleted file mode 100644 (file)
index e03f975..0000000
+++ /dev/null
@@ -1 +0,0 @@
-#include <asm-sparc/termbits.h>
diff --git a/include/asm-sparc64/termios.h b/include/asm-sparc64/termios.h
deleted file mode 100644 (file)
index 940495e..0000000
+++ /dev/null
@@ -1 +0,0 @@
-#include <asm-sparc/termios.h>
diff --git a/include/asm-sparc64/thread_info.h b/include/asm-sparc64/thread_info.h
deleted file mode 100644 (file)
index 92bed79..0000000
+++ /dev/null
@@ -1 +0,0 @@
-#include <asm-sparc/thread_info.h>
diff --git a/include/asm-sparc64/timer.h b/include/asm-sparc64/timer.h
deleted file mode 100644 (file)
index 88026d8..0000000
+++ /dev/null
@@ -1 +0,0 @@
-#include <asm-sparc/timer.h>
diff --git a/include/asm-sparc64/timex.h b/include/asm-sparc64/timex.h
deleted file mode 100644 (file)
index 8dd59ee..0000000
+++ /dev/null
@@ -1 +0,0 @@
-#include <asm-sparc/timex.h>
diff --git a/include/asm-sparc64/tlb.h b/include/asm-sparc64/tlb.h
deleted file mode 100644 (file)
index ae92fce..0000000
+++ /dev/null
@@ -1 +0,0 @@
-#include <asm-sparc/tlb.h>
diff --git a/include/asm-sparc64/tlbflush.h b/include/asm-sparc64/tlbflush.h
deleted file mode 100644 (file)
index a43979a..0000000
+++ /dev/null
@@ -1 +0,0 @@
-#include <asm-sparc/tlbflush.h>
diff --git a/include/asm-sparc64/topology.h b/include/asm-sparc64/topology.h
deleted file mode 100644 (file)
index 46999b6..0000000
+++ /dev/null
@@ -1 +0,0 @@
-#include <asm-sparc/topology.h>
diff --git a/include/asm-sparc64/tsb.h b/include/asm-sparc64/tsb.h
deleted file mode 100644 (file)
index 3677a30..0000000
+++ /dev/null
@@ -1 +0,0 @@
-#include <asm-sparc/tsb.h>
diff --git a/include/asm-sparc64/ttable.h b/include/asm-sparc64/ttable.h
deleted file mode 100644 (file)
index a550f1b..0000000
+++ /dev/null
@@ -1 +0,0 @@
-#include <asm-sparc/ttable.h>
diff --git a/include/asm-sparc64/types.h b/include/asm-sparc64/types.h
deleted file mode 100644 (file)
index cfbfad5..0000000
+++ /dev/null
@@ -1 +0,0 @@
-#include <asm-sparc/types.h>
diff --git a/include/asm-sparc64/uaccess.h b/include/asm-sparc64/uaccess.h
deleted file mode 100644 (file)
index 2872d22..0000000
+++ /dev/null
@@ -1 +0,0 @@
-#include <asm-sparc/uaccess.h>
diff --git a/include/asm-sparc64/uctx.h b/include/asm-sparc64/uctx.h
deleted file mode 100644 (file)
index 9e1b579..0000000
+++ /dev/null
@@ -1 +0,0 @@
-#include <asm-sparc/uctx.h>
diff --git a/include/asm-sparc64/unaligned.h b/include/asm-sparc64/unaligned.h
deleted file mode 100644 (file)
index 19fbf95..0000000
+++ /dev/null
@@ -1 +0,0 @@
-#include <asm-sparc/unaligned.h>
diff --git a/include/asm-sparc64/unistd.h b/include/asm-sparc64/unistd.h
deleted file mode 100644 (file)
index ad86e0b..0000000
+++ /dev/null
@@ -1 +0,0 @@
-#include <asm-sparc/unistd.h>
diff --git a/include/asm-sparc64/upa.h b/include/asm-sparc64/upa.h
deleted file mode 100644 (file)
index aab7293..0000000
+++ /dev/null
@@ -1 +0,0 @@
-#include <asm-sparc/upa.h>
diff --git a/include/asm-sparc64/user.h b/include/asm-sparc64/user.h
deleted file mode 100644 (file)
index 29fc6e9..0000000
+++ /dev/null
@@ -1 +0,0 @@
-#include <asm-sparc/user.h>
diff --git a/include/asm-sparc64/utrap.h b/include/asm-sparc64/utrap.h
deleted file mode 100644 (file)
index b030a41..0000000
+++ /dev/null
@@ -1 +0,0 @@
-#include <asm-sparc/utrap.h>
diff --git a/include/asm-sparc64/vga.h b/include/asm-sparc64/vga.h
deleted file mode 100644 (file)
index fbf4d58..0000000
+++ /dev/null
@@ -1 +0,0 @@
-#include <asm-sparc/vga.h>
diff --git a/include/asm-sparc64/vio.h b/include/asm-sparc64/vio.h
deleted file mode 100644 (file)
index 299b26a..0000000
+++ /dev/null
@@ -1 +0,0 @@
-#include <asm-sparc/vio.h>
diff --git a/include/asm-sparc64/visasm.h b/include/asm-sparc64/visasm.h
deleted file mode 100644 (file)
index 837a122..0000000
+++ /dev/null
@@ -1 +0,0 @@
-#include <asm-sparc/visasm.h>
diff --git a/include/asm-sparc64/watchdog.h b/include/asm-sparc64/watchdog.h
deleted file mode 100644 (file)
index b0f2857..0000000
+++ /dev/null
@@ -1 +0,0 @@
-#include <asm-sparc/watchdog.h>
diff --git a/include/asm-sparc64/xor.h b/include/asm-sparc64/xor.h
deleted file mode 100644 (file)
index ef187cc..0000000
+++ /dev/null
@@ -1 +0,0 @@
-#include <asm-sparc/xor.h>