From a439fe51a1f8eb087c22dd24d69cebae4a3addac Mon Sep 17 00:00:00 2001
From: Sam Ravnborg <sam@ravnborg.org>
Date: Sun, 27 Jul 2008 23:00:59 +0200
Subject: [PATCH] sparc, sparc64: use arch/sparc/include

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

diff --git a/Makefile b/Makefile
index 40f24810116cc..baee3d414754f 100644
--- 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
 
diff --git a/include/asm-sparc/Kbuild b/arch/sparc/include/asm/Kbuild
similarity index 100%
rename from include/asm-sparc/Kbuild
rename to arch/sparc/include/asm/Kbuild
diff --git a/include/asm-sparc/agp.h b/arch/sparc/include/asm/agp.h
similarity index 100%
rename from include/asm-sparc/agp.h
rename to arch/sparc/include/asm/agp.h
diff --git a/include/asm-sparc/apb.h b/arch/sparc/include/asm/apb.h
similarity index 100%
rename from include/asm-sparc/apb.h
rename to arch/sparc/include/asm/apb.h
diff --git a/include/asm-sparc/apc.h b/arch/sparc/include/asm/apc.h
similarity index 100%
rename from include/asm-sparc/apc.h
rename to arch/sparc/include/asm/apc.h
diff --git a/include/asm-sparc/asi.h b/arch/sparc/include/asm/asi.h
similarity index 100%
rename from include/asm-sparc/asi.h
rename to arch/sparc/include/asm/asi.h
diff --git a/include/asm-sparc/asmmacro.h b/arch/sparc/include/asm/asmmacro.h
similarity index 100%
rename from include/asm-sparc/asmmacro.h
rename to arch/sparc/include/asm/asmmacro.h
diff --git a/include/asm-sparc/atomic.h b/arch/sparc/include/asm/atomic.h
similarity index 65%
rename from include/asm-sparc/atomic.h
rename to arch/sparc/include/asm/atomic.h
index 66d8166ec1d7d..8ff83d8cc33fd 100644
--- a/include/asm-sparc/atomic.h
+++ b/arch/sparc/include/asm/atomic.h
@@ -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
diff --git a/include/asm-sparc/atomic_32.h b/arch/sparc/include/asm/atomic_32.h
similarity index 100%
rename from include/asm-sparc/atomic_32.h
rename to arch/sparc/include/asm/atomic_32.h
diff --git a/include/asm-sparc/atomic_64.h b/arch/sparc/include/asm/atomic_64.h
similarity index 100%
rename from include/asm-sparc/atomic_64.h
rename to arch/sparc/include/asm/atomic_64.h
diff --git a/include/asm-sparc/auxio.h b/arch/sparc/include/asm/auxio.h
similarity index 65%
rename from include/asm-sparc/auxio.h
rename to arch/sparc/include/asm/auxio.h
index 24c6f3c0f5779..13dc67f03011e 100644
--- a/include/asm-sparc/auxio.h
+++ b/arch/sparc/include/asm/auxio.h
@@ -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
diff --git a/include/asm-sparc/auxio_32.h b/arch/sparc/include/asm/auxio_32.h
similarity index 97%
rename from include/asm-sparc/auxio_32.h
rename to arch/sparc/include/asm/auxio_32.h
index 4db8f23db20f1..e03e088be95f2 100644
--- a/include/asm-sparc/auxio_32.h
+++ b/arch/sparc/include/asm/auxio_32.h
@@ -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
diff --git a/include/asm-sparc/auxio_64.h b/arch/sparc/include/asm/auxio_64.h
similarity index 100%
rename from include/asm-sparc/auxio_64.h
rename to arch/sparc/include/asm/auxio_64.h
diff --git a/include/asm-sparc/auxvec.h b/arch/sparc/include/asm/auxvec.h
similarity index 100%
rename from include/asm-sparc/auxvec.h
rename to arch/sparc/include/asm/auxvec.h
diff --git a/include/asm-sparc/backoff.h b/arch/sparc/include/asm/backoff.h
similarity index 100%
rename from include/asm-sparc/backoff.h
rename to arch/sparc/include/asm/backoff.h
diff --git a/include/asm-sparc/bbc.h b/arch/sparc/include/asm/bbc.h
similarity index 100%
rename from include/asm-sparc/bbc.h
rename to arch/sparc/include/asm/bbc.h
diff --git a/include/asm-sparc/bitext.h b/arch/sparc/include/asm/bitext.h
similarity index 100%
rename from include/asm-sparc/bitext.h
rename to arch/sparc/include/asm/bitext.h
diff --git a/include/asm-sparc/bitops.h b/arch/sparc/include/asm/bitops.h
similarity index 65%
rename from include/asm-sparc/bitops.h
rename to arch/sparc/include/asm/bitops.h
index 1a2949d0193fa..b1edd94bd64f3 100644
--- a/include/asm-sparc/bitops.h
+++ b/arch/sparc/include/asm/bitops.h
@@ -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
diff --git a/include/asm-sparc/bitops_32.h b/arch/sparc/include/asm/bitops_32.h
similarity index 100%
rename from include/asm-sparc/bitops_32.h
rename to arch/sparc/include/asm/bitops_32.h
diff --git a/include/asm-sparc/bitops_64.h b/arch/sparc/include/asm/bitops_64.h
similarity index 100%
rename from include/asm-sparc/bitops_64.h
rename to arch/sparc/include/asm/bitops_64.h
diff --git a/include/asm-sparc/bpp.h b/arch/sparc/include/asm/bpp.h
similarity index 100%
rename from include/asm-sparc/bpp.h
rename to arch/sparc/include/asm/bpp.h
diff --git a/include/asm-sparc/btfixup.h b/arch/sparc/include/asm/btfixup.h
similarity index 99%
rename from include/asm-sparc/btfixup.h
rename to arch/sparc/include/asm/btfixup.h
index 08277e6fb4cd5..797722cf69f28 100644
--- a/include/asm-sparc/btfixup.h
+++ b/arch/sparc/include/asm/btfixup.h
@@ -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)
  */
diff --git a/include/asm-sparc/bug.h b/arch/sparc/include/asm/bug.h
similarity index 100%
rename from include/asm-sparc/bug.h
rename to arch/sparc/include/asm/bug.h
diff --git a/include/asm-sparc/bugs.h b/arch/sparc/include/asm/bugs.h
similarity index 87%
rename from include/asm-sparc/bugs.h
rename to arch/sparc/include/asm/bugs.h
index 2dfc07bc8e547..e179bc12f64a4 100644
--- a/include/asm-sparc/bugs.h
+++ b/arch/sparc/include/asm/bugs.h
@@ -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)
  */
diff --git a/include/asm-sparc/byteorder.h b/arch/sparc/include/asm/byteorder.h
similarity index 100%
rename from include/asm-sparc/byteorder.h
rename to arch/sparc/include/asm/byteorder.h
diff --git a/include/asm-sparc/cache.h b/arch/sparc/include/asm/cache.h
similarity index 100%
rename from include/asm-sparc/cache.h
rename to arch/sparc/include/asm/cache.h
diff --git a/include/asm-sparc/cacheflush.h b/arch/sparc/include/asm/cacheflush.h
similarity index 64%
rename from include/asm-sparc/cacheflush.h
rename to arch/sparc/include/asm/cacheflush.h
index 2b6a37957c2da..049168087b198 100644
--- a/include/asm-sparc/cacheflush.h
+++ b/arch/sparc/include/asm/cacheflush.h
@@ -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
diff --git a/include/asm-sparc/cacheflush_32.h b/arch/sparc/include/asm/cacheflush_32.h
similarity index 100%
rename from include/asm-sparc/cacheflush_32.h
rename to arch/sparc/include/asm/cacheflush_32.h
diff --git a/include/asm-sparc/cacheflush_64.h b/arch/sparc/include/asm/cacheflush_64.h
similarity index 100%
rename from include/asm-sparc/cacheflush_64.h
rename to arch/sparc/include/asm/cacheflush_64.h
diff --git a/include/asm-sparc/chafsr.h b/arch/sparc/include/asm/chafsr.h
similarity index 100%
rename from include/asm-sparc/chafsr.h
rename to arch/sparc/include/asm/chafsr.h
diff --git a/include/asm-sparc/checksum.h b/arch/sparc/include/asm/checksum.h
similarity index 65%
rename from include/asm-sparc/checksum.h
rename to arch/sparc/include/asm/checksum.h
index 4e3553d4f6e17..7ac0d7497bc59 100644
--- a/include/asm-sparc/checksum.h
+++ b/arch/sparc/include/asm/checksum.h
@@ -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
diff --git a/include/asm-sparc/checksum_32.h b/arch/sparc/include/asm/checksum_32.h
similarity index 100%
rename from include/asm-sparc/checksum_32.h
rename to arch/sparc/include/asm/checksum_32.h
diff --git a/include/asm-sparc/checksum_64.h b/arch/sparc/include/asm/checksum_64.h
similarity index 100%
rename from include/asm-sparc/checksum_64.h
rename to arch/sparc/include/asm/checksum_64.h
diff --git a/include/asm-sparc/chmctrl.h b/arch/sparc/include/asm/chmctrl.h
similarity index 100%
rename from include/asm-sparc/chmctrl.h
rename to arch/sparc/include/asm/chmctrl.h
diff --git a/include/asm-sparc/clock.h b/arch/sparc/include/asm/clock.h
similarity index 100%
rename from include/asm-sparc/clock.h
rename to arch/sparc/include/asm/clock.h
diff --git a/include/asm-sparc/cmt.h b/arch/sparc/include/asm/cmt.h
similarity index 100%
rename from include/asm-sparc/cmt.h
rename to arch/sparc/include/asm/cmt.h
diff --git a/include/asm-sparc/compat.h b/arch/sparc/include/asm/compat.h
similarity index 100%
rename from include/asm-sparc/compat.h
rename to arch/sparc/include/asm/compat.h
diff --git a/include/asm-sparc/compat_signal.h b/arch/sparc/include/asm/compat_signal.h
similarity index 100%
rename from include/asm-sparc/compat_signal.h
rename to arch/sparc/include/asm/compat_signal.h
diff --git a/include/asm-sparc/contregs.h b/arch/sparc/include/asm/contregs.h
similarity index 100%
rename from include/asm-sparc/contregs.h
rename to arch/sparc/include/asm/contregs.h
diff --git a/include/asm-sparc/cpudata.h b/arch/sparc/include/asm/cpudata.h
similarity index 65%
rename from include/asm-sparc/cpudata.h
rename to arch/sparc/include/asm/cpudata.h
index b76fac0c8d8fe..b5976de7cacdb 100644
--- a/include/asm-sparc/cpudata.h
+++ b/arch/sparc/include/asm/cpudata.h
@@ -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
diff --git a/include/asm-sparc/cpudata_32.h b/arch/sparc/include/asm/cpudata_32.h
similarity index 89%
rename from include/asm-sparc/cpudata_32.h
rename to arch/sparc/include/asm/cpudata_32.h
index a2c4d51d36c4c..31d48a0e32c7c 100644
--- a/include/asm-sparc/cpudata_32.h
+++ b/arch/sparc/include/asm/cpudata_32.h
@@ -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.
  */
 
diff --git a/include/asm-sparc/cpudata_64.h b/arch/sparc/include/asm/cpudata_64.h
similarity index 100%
rename from include/asm-sparc/cpudata_64.h
rename to arch/sparc/include/asm/cpudata_64.h
diff --git a/include/asm-sparc/cputime.h b/arch/sparc/include/asm/cputime.h
similarity index 100%
rename from include/asm-sparc/cputime.h
rename to arch/sparc/include/asm/cputime.h
diff --git a/include/asm-sparc/current.h b/arch/sparc/include/asm/current.h
similarity index 96%
rename from include/asm-sparc/current.h
rename to arch/sparc/include/asm/current.h
index 8a1d9d6643b05..10a0df55a574a 100644
--- a/include/asm-sparc/current.h
+++ b/arch/sparc/include/asm/current.h
@@ -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)
diff --git a/include/asm-sparc/cypress.h b/arch/sparc/include/asm/cypress.h
similarity index 100%
rename from include/asm-sparc/cypress.h
rename to arch/sparc/include/asm/cypress.h
diff --git a/include/asm-sparc/dcr.h b/arch/sparc/include/asm/dcr.h
similarity index 100%
rename from include/asm-sparc/dcr.h
rename to arch/sparc/include/asm/dcr.h
diff --git a/include/asm-sparc/dcu.h b/arch/sparc/include/asm/dcu.h
similarity index 100%
rename from include/asm-sparc/dcu.h
rename to arch/sparc/include/asm/dcu.h
diff --git a/include/asm-sparc/delay.h b/arch/sparc/include/asm/delay.h
similarity index 65%
rename from include/asm-sparc/delay.h
rename to arch/sparc/include/asm/delay.h
index 6210a3ce97517..467caa2a97a04 100644
--- a/include/asm-sparc/delay.h
+++ b/arch/sparc/include/asm/delay.h
@@ -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
diff --git a/include/asm-sparc/delay_32.h b/arch/sparc/include/asm/delay_32.h
similarity index 100%
rename from include/asm-sparc/delay_32.h
rename to arch/sparc/include/asm/delay_32.h
diff --git a/include/asm-sparc/delay_64.h b/arch/sparc/include/asm/delay_64.h
similarity index 100%
rename from include/asm-sparc/delay_64.h
rename to arch/sparc/include/asm/delay_64.h
diff --git a/include/asm-sparc/device.h b/arch/sparc/include/asm/device.h
similarity index 100%
rename from include/asm-sparc/device.h
rename to arch/sparc/include/asm/device.h
diff --git a/include/asm-sparc/display7seg.h b/arch/sparc/include/asm/display7seg.h
similarity index 100%
rename from include/asm-sparc/display7seg.h
rename to arch/sparc/include/asm/display7seg.h
diff --git a/include/asm-sparc/div64.h b/arch/sparc/include/asm/div64.h
similarity index 100%
rename from include/asm-sparc/div64.h
rename to arch/sparc/include/asm/div64.h
diff --git a/include/asm-sparc/dma-mapping.h b/arch/sparc/include/asm/dma-mapping.h
similarity index 64%
rename from include/asm-sparc/dma-mapping.h
rename to arch/sparc/include/asm/dma-mapping.h
index 7483504259cef..0f4150e26619c 100644
--- a/include/asm-sparc/dma-mapping.h
+++ b/arch/sparc/include/asm/dma-mapping.h
@@ -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
diff --git a/include/asm-sparc/dma-mapping_32.h b/arch/sparc/include/asm/dma-mapping_32.h
similarity index 100%
rename from include/asm-sparc/dma-mapping_32.h
rename to arch/sparc/include/asm/dma-mapping_32.h
diff --git a/include/asm-sparc/dma-mapping_64.h b/arch/sparc/include/asm/dma-mapping_64.h
similarity index 100%
rename from include/asm-sparc/dma-mapping_64.h
rename to arch/sparc/include/asm/dma-mapping_64.h
diff --git a/include/asm-sparc/dma.h b/arch/sparc/include/asm/dma.h
similarity index 66%
rename from include/asm-sparc/dma.h
rename to arch/sparc/include/asm/dma.h
index 8cc69bfaae2ab..aa1d90ac04c58 100644
--- a/include/asm-sparc/dma.h
+++ b/arch/sparc/include/asm/dma.h
@@ -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
diff --git a/include/asm-sparc/dma_32.h b/arch/sparc/include/asm/dma_32.h
similarity index 99%
rename from include/asm-sparc/dma_32.h
rename to arch/sparc/include/asm/dma_32.h
index 959d6c8a71ae7..cf7189c0079b2 100644
--- a/include/asm-sparc/dma_32.h
+++ b/arch/sparc/include/asm/dma_32.h
@@ -1,4 +1,4 @@
-/* include/asm-sparc/dma.h
+/* include/asm/dma.h
  *
  * Copyright 1995 (C) David S. Miller (davem@davemloft.net)
  */
diff --git a/include/asm-sparc/dma_64.h b/arch/sparc/include/asm/dma_64.h
similarity index 99%
rename from include/asm-sparc/dma_64.h
rename to arch/sparc/include/asm/dma_64.h
index 9d4c024bd3b38..46a8aecffc02c 100644
--- a/include/asm-sparc/dma_64.h
+++ b/arch/sparc/include/asm/dma_64.h
@@ -1,5 +1,5 @@
 /*
- * include/asm-sparc64/dma.h
+ * include/asm/dma.h
  *
  * Copyright 1996 (C) David S. Miller (davem@caip.rutgers.edu)
  */
diff --git a/include/asm-sparc/ebus.h b/arch/sparc/include/asm/ebus.h
similarity index 66%
rename from include/asm-sparc/ebus.h
rename to arch/sparc/include/asm/ebus.h
index a5da2d00cd181..83a6d16c22e68 100644
--- a/include/asm-sparc/ebus.h
+++ b/arch/sparc/include/asm/ebus.h
@@ -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
diff --git a/include/asm-sparc/ebus_32.h b/arch/sparc/include/asm/ebus_32.h
similarity index 100%
rename from include/asm-sparc/ebus_32.h
rename to arch/sparc/include/asm/ebus_32.h
diff --git a/include/asm-sparc/ebus_64.h b/arch/sparc/include/asm/ebus_64.h
similarity index 100%
rename from include/asm-sparc/ebus_64.h
rename to arch/sparc/include/asm/ebus_64.h
diff --git a/include/asm-sparc/ecc.h b/arch/sparc/include/asm/ecc.h
similarity index 100%
rename from include/asm-sparc/ecc.h
rename to arch/sparc/include/asm/ecc.h
diff --git a/include/asm-sparc/eeprom.h b/arch/sparc/include/asm/eeprom.h
similarity index 100%
rename from include/asm-sparc/eeprom.h
rename to arch/sparc/include/asm/eeprom.h
diff --git a/include/asm-sparc/elf.h b/arch/sparc/include/asm/elf.h
similarity index 66%
rename from include/asm-sparc/elf.h
rename to arch/sparc/include/asm/elf.h
index f035c45d7b5e3..0a2816c50b07f 100644
--- a/include/asm-sparc/elf.h
+++ b/arch/sparc/include/asm/elf.h
@@ -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
diff --git a/include/asm-sparc/elf_32.h b/arch/sparc/include/asm/elf_32.h
similarity index 100%
rename from include/asm-sparc/elf_32.h
rename to arch/sparc/include/asm/elf_32.h
diff --git a/include/asm-sparc/elf_64.h b/arch/sparc/include/asm/elf_64.h
similarity index 100%
rename from include/asm-sparc/elf_64.h
rename to arch/sparc/include/asm/elf_64.h
diff --git a/include/asm-sparc/emergency-restart.h b/arch/sparc/include/asm/emergency-restart.h
similarity index 100%
rename from include/asm-sparc/emergency-restart.h
rename to arch/sparc/include/asm/emergency-restart.h
diff --git a/include/asm-sparc/envctrl.h b/arch/sparc/include/asm/envctrl.h
similarity index 100%
rename from include/asm-sparc/envctrl.h
rename to arch/sparc/include/asm/envctrl.h
diff --git a/include/asm-sparc/errno.h b/arch/sparc/include/asm/errno.h
similarity index 100%
rename from include/asm-sparc/errno.h
rename to arch/sparc/include/asm/errno.h
diff --git a/include/asm-sparc/estate.h b/arch/sparc/include/asm/estate.h
similarity index 100%
rename from include/asm-sparc/estate.h
rename to arch/sparc/include/asm/estate.h
diff --git a/include/asm-sparc/fb.h b/arch/sparc/include/asm/fb.h
similarity index 100%
rename from include/asm-sparc/fb.h
rename to arch/sparc/include/asm/fb.h
diff --git a/include/asm-sparc/fbio.h b/arch/sparc/include/asm/fbio.h
similarity index 100%
rename from include/asm-sparc/fbio.h
rename to arch/sparc/include/asm/fbio.h
diff --git a/include/asm-sparc/fcntl.h b/arch/sparc/include/asm/fcntl.h
similarity index 100%
rename from include/asm-sparc/fcntl.h
rename to arch/sparc/include/asm/fcntl.h
diff --git a/include/asm-sparc/fhc.h b/arch/sparc/include/asm/fhc.h
similarity index 100%
rename from include/asm-sparc/fhc.h
rename to arch/sparc/include/asm/fhc.h
diff --git a/include/asm-sparc/fixmap.h b/arch/sparc/include/asm/fixmap.h
similarity index 100%
rename from include/asm-sparc/fixmap.h
rename to arch/sparc/include/asm/fixmap.h
diff --git a/include/asm-sparc/floppy.h b/arch/sparc/include/asm/floppy.h
similarity index 65%
rename from include/asm-sparc/floppy.h
rename to arch/sparc/include/asm/floppy.h
index 6c628ba15a8d6..faebd335b6006 100644
--- a/include/asm-sparc/floppy.h
+++ b/arch/sparc/include/asm/floppy.h
@@ -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
diff --git a/include/asm-sparc/floppy_32.h b/arch/sparc/include/asm/floppy_32.h
similarity index 99%
rename from include/asm-sparc/floppy_32.h
rename to arch/sparc/include/asm/floppy_32.h
index acdd06eafe596..ae3f00bf22ff9 100644
--- a/include/asm-sparc/floppy_32.h
+++ b/arch/sparc/include/asm/floppy_32.h
@@ -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)
  */
diff --git a/include/asm-sparc/floppy_64.h b/arch/sparc/include/asm/floppy_64.h
similarity index 100%
rename from include/asm-sparc/floppy_64.h
rename to arch/sparc/include/asm/floppy_64.h
diff --git a/include/asm-sparc/fpumacro.h b/arch/sparc/include/asm/fpumacro.h
similarity index 100%
rename from include/asm-sparc/fpumacro.h
rename to arch/sparc/include/asm/fpumacro.h
diff --git a/include/asm-sparc64/ftrace.h b/arch/sparc/include/asm/ftrace.h
similarity index 100%
rename from include/asm-sparc64/ftrace.h
rename to arch/sparc/include/asm/ftrace.h
diff --git a/include/asm-sparc/futex.h b/arch/sparc/include/asm/futex.h
similarity index 65%
rename from include/asm-sparc/futex.h
rename to arch/sparc/include/asm/futex.h
index c6a9f038c531b..736335f367137 100644
--- a/include/asm-sparc/futex.h
+++ b/arch/sparc/include/asm/futex.h
@@ -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
diff --git a/include/asm-sparc/futex_32.h b/arch/sparc/include/asm/futex_32.h
similarity index 100%
rename from include/asm-sparc/futex_32.h
rename to arch/sparc/include/asm/futex_32.h
diff --git a/include/asm-sparc/futex_64.h b/arch/sparc/include/asm/futex_64.h
similarity index 100%
rename from include/asm-sparc/futex_64.h
rename to arch/sparc/include/asm/futex_64.h
diff --git a/include/asm-sparc/hardirq.h b/arch/sparc/include/asm/hardirq.h
similarity index 65%
rename from include/asm-sparc/hardirq.h
rename to arch/sparc/include/asm/hardirq.h
index 1564787731003..44d4e23451486 100644
--- a/include/asm-sparc/hardirq.h
+++ b/arch/sparc/include/asm/hardirq.h
@@ -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
diff --git a/include/asm-sparc/hardirq_32.h b/arch/sparc/include/asm/hardirq_32.h
similarity index 100%
rename from include/asm-sparc/hardirq_32.h
rename to arch/sparc/include/asm/hardirq_32.h
diff --git a/include/asm-sparc/hardirq_64.h b/arch/sparc/include/asm/hardirq_64.h
similarity index 100%
rename from include/asm-sparc/hardirq_64.h
rename to arch/sparc/include/asm/hardirq_64.h
diff --git a/include/asm-sparc/head.h b/arch/sparc/include/asm/head.h
similarity index 66%
rename from include/asm-sparc/head.h
rename to arch/sparc/include/asm/head.h
index 14652abdea31c..be8f03f3e731d 100644
--- a/include/asm-sparc/head.h
+++ b/arch/sparc/include/asm/head.h
@@ -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
diff --git a/include/asm-sparc/head_32.h b/arch/sparc/include/asm/head_32.h
similarity index 100%
rename from include/asm-sparc/head_32.h
rename to arch/sparc/include/asm/head_32.h
diff --git a/include/asm-sparc/head_64.h b/arch/sparc/include/asm/head_64.h
similarity index 100%
rename from include/asm-sparc/head_64.h
rename to arch/sparc/include/asm/head_64.h
diff --git a/include/asm-sparc/highmem.h b/arch/sparc/include/asm/highmem.h
similarity index 100%
rename from include/asm-sparc/highmem.h
rename to arch/sparc/include/asm/highmem.h
diff --git a/include/asm-sparc/hugetlb.h b/arch/sparc/include/asm/hugetlb.h
similarity index 100%
rename from include/asm-sparc/hugetlb.h
rename to arch/sparc/include/asm/hugetlb.h
diff --git a/include/asm-sparc/hvtramp.h b/arch/sparc/include/asm/hvtramp.h
similarity index 100%
rename from include/asm-sparc/hvtramp.h
rename to arch/sparc/include/asm/hvtramp.h
diff --git a/include/asm-sparc/hw_irq.h b/arch/sparc/include/asm/hw_irq.h
similarity index 100%
rename from include/asm-sparc/hw_irq.h
rename to arch/sparc/include/asm/hw_irq.h
diff --git a/include/asm-sparc/hypervisor.h b/arch/sparc/include/asm/hypervisor.h
similarity index 100%
rename from include/asm-sparc/hypervisor.h
rename to arch/sparc/include/asm/hypervisor.h
diff --git a/include/asm-sparc/ide.h b/arch/sparc/include/asm/ide.h
similarity index 100%
rename from include/asm-sparc/ide.h
rename to arch/sparc/include/asm/ide.h
diff --git a/include/asm-sparc/idprom.h b/arch/sparc/include/asm/idprom.h
similarity index 100%
rename from include/asm-sparc/idprom.h
rename to arch/sparc/include/asm/idprom.h
diff --git a/include/asm-sparc/intr_queue.h b/arch/sparc/include/asm/intr_queue.h
similarity index 100%
rename from include/asm-sparc/intr_queue.h
rename to arch/sparc/include/asm/intr_queue.h
diff --git a/include/asm-sparc/io-unit.h b/arch/sparc/include/asm/io-unit.h
similarity index 100%
rename from include/asm-sparc/io-unit.h
rename to arch/sparc/include/asm/io-unit.h
diff --git a/include/asm-sparc/io.h b/arch/sparc/include/asm/io.h
similarity index 67%
rename from include/asm-sparc/io.h
rename to arch/sparc/include/asm/io.h
index fc9024d3dfc30..a34b2994937ab 100644
--- a/include/asm-sparc/io.h
+++ b/arch/sparc/include/asm/io.h
@@ -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
diff --git a/include/asm-sparc/io_32.h b/arch/sparc/include/asm/io_32.h
similarity index 100%
rename from include/asm-sparc/io_32.h
rename to arch/sparc/include/asm/io_32.h
diff --git a/include/asm-sparc/io_64.h b/arch/sparc/include/asm/io_64.h
similarity index 100%
rename from include/asm-sparc/io_64.h
rename to arch/sparc/include/asm/io_64.h
diff --git a/include/asm-sparc/ioctl.h b/arch/sparc/include/asm/ioctl.h
similarity index 100%
rename from include/asm-sparc/ioctl.h
rename to arch/sparc/include/asm/ioctl.h
diff --git a/include/asm-sparc/ioctls.h b/arch/sparc/include/asm/ioctls.h
similarity index 100%
rename from include/asm-sparc/ioctls.h
rename to arch/sparc/include/asm/ioctls.h
diff --git a/include/asm-sparc/iommu.h b/arch/sparc/include/asm/iommu.h
similarity index 65%
rename from include/asm-sparc/iommu.h
rename to arch/sparc/include/asm/iommu.h
index 91b072b0d7a08..e650965b4a8d1 100644
--- a/include/asm-sparc/iommu.h
+++ b/arch/sparc/include/asm/iommu.h
@@ -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
diff --git a/include/asm-sparc/iommu_32.h b/arch/sparc/include/asm/iommu_32.h
similarity index 100%
rename from include/asm-sparc/iommu_32.h
rename to arch/sparc/include/asm/iommu_32.h
diff --git a/include/asm-sparc/iommu_64.h b/arch/sparc/include/asm/iommu_64.h
similarity index 100%
rename from include/asm-sparc/iommu_64.h
rename to arch/sparc/include/asm/iommu_64.h
diff --git a/include/asm-sparc/ipcbuf.h b/arch/sparc/include/asm/ipcbuf.h
similarity index 65%
rename from include/asm-sparc/ipcbuf.h
rename to arch/sparc/include/asm/ipcbuf.h
index 037605d986e25..17d6ef7b23a48 100644
--- a/include/asm-sparc/ipcbuf.h
+++ b/arch/sparc/include/asm/ipcbuf.h
@@ -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
diff --git a/include/asm-sparc/ipcbuf_32.h b/arch/sparc/include/asm/ipcbuf_32.h
similarity index 100%
rename from include/asm-sparc/ipcbuf_32.h
rename to arch/sparc/include/asm/ipcbuf_32.h
diff --git a/include/asm-sparc/ipcbuf_64.h b/arch/sparc/include/asm/ipcbuf_64.h
similarity index 100%
rename from include/asm-sparc/ipcbuf_64.h
rename to arch/sparc/include/asm/ipcbuf_64.h
diff --git a/include/asm-sparc/irq.h b/arch/sparc/include/asm/irq.h
similarity index 66%
rename from include/asm-sparc/irq.h
rename to arch/sparc/include/asm/irq.h
index 7af6bb4aa09c8..3b44a6a140747 100644
--- a/include/asm-sparc/irq.h
+++ b/arch/sparc/include/asm/irq.h
@@ -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
diff --git a/include/asm-sparc/irq_32.h b/arch/sparc/include/asm/irq_32.h
similarity index 100%
rename from include/asm-sparc/irq_32.h
rename to arch/sparc/include/asm/irq_32.h
diff --git a/include/asm-sparc/irq_64.h b/arch/sparc/include/asm/irq_64.h
similarity index 100%
rename from include/asm-sparc/irq_64.h
rename to arch/sparc/include/asm/irq_64.h
diff --git a/include/asm-sparc/irq_regs.h b/arch/sparc/include/asm/irq_regs.h
similarity index 100%
rename from include/asm-sparc/irq_regs.h
rename to arch/sparc/include/asm/irq_regs.h
diff --git a/include/asm-sparc/irqflags.h b/arch/sparc/include/asm/irqflags.h
similarity index 65%
rename from include/asm-sparc/irqflags.h
rename to arch/sparc/include/asm/irqflags.h
index c6402b187e23c..1e138632bd3f0 100644
--- a/include/asm-sparc/irqflags.h
+++ b/arch/sparc/include/asm/irqflags.h
@@ -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
diff --git a/include/asm-sparc/irqflags_32.h b/arch/sparc/include/asm/irqflags_32.h
similarity index 96%
rename from include/asm-sparc/irqflags_32.h
rename to arch/sparc/include/asm/irqflags_32.h
index db398fb328263..0fca9d97d44f1 100644
--- a/include/asm-sparc/irqflags_32.h
+++ b/arch/sparc/include/asm/irqflags_32.h
@@ -1,5 +1,5 @@
 /*
- * include/asm-sparc/irqflags.h
+ * include/asm/irqflags.h
  *
  * IRQ flags handling
  *
diff --git a/include/asm-sparc/irqflags_64.h b/arch/sparc/include/asm/irqflags_64.h
similarity index 97%
rename from include/asm-sparc/irqflags_64.h
rename to arch/sparc/include/asm/irqflags_64.h
index 024fc54d06820..bb42e59162aab 100644
--- a/include/asm-sparc/irqflags_64.h
+++ b/arch/sparc/include/asm/irqflags_64.h
@@ -1,5 +1,5 @@
 /*
- * include/asm-sparc64/irqflags.h
+ * include/asm/irqflags.h
  *
  * IRQ flags handling
  *
diff --git a/include/asm-sparc/jsflash.h b/arch/sparc/include/asm/jsflash.h
similarity index 100%
rename from include/asm-sparc/jsflash.h
rename to arch/sparc/include/asm/jsflash.h
diff --git a/include/asm-sparc/kdebug.h b/arch/sparc/include/asm/kdebug.h
similarity index 65%
rename from include/asm-sparc/kdebug.h
rename to arch/sparc/include/asm/kdebug.h
index fe07d00d05344..8d12581ca3861 100644
--- a/include/asm-sparc/kdebug.h
+++ b/arch/sparc/include/asm/kdebug.h
@@ -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
diff --git a/include/asm-sparc/kdebug_32.h b/arch/sparc/include/asm/kdebug_32.h
similarity index 100%
rename from include/asm-sparc/kdebug_32.h
rename to arch/sparc/include/asm/kdebug_32.h
diff --git a/include/asm-sparc/kdebug_64.h b/arch/sparc/include/asm/kdebug_64.h
similarity index 100%
rename from include/asm-sparc/kdebug_64.h
rename to arch/sparc/include/asm/kdebug_64.h
diff --git a/include/asm-sparc/kgdb.h b/arch/sparc/include/asm/kgdb.h
similarity index 100%
rename from include/asm-sparc/kgdb.h
rename to arch/sparc/include/asm/kgdb.h
diff --git a/include/asm-sparc/kmap_types.h b/arch/sparc/include/asm/kmap_types.h
similarity index 100%
rename from include/asm-sparc/kmap_types.h
rename to arch/sparc/include/asm/kmap_types.h
diff --git a/include/asm-sparc/kprobes.h b/arch/sparc/include/asm/kprobes.h
similarity index 100%
rename from include/asm-sparc/kprobes.h
rename to arch/sparc/include/asm/kprobes.h
diff --git a/include/asm-sparc/ldc.h b/arch/sparc/include/asm/ldc.h
similarity index 100%
rename from include/asm-sparc/ldc.h
rename to arch/sparc/include/asm/ldc.h
diff --git a/include/asm-sparc/linkage.h b/arch/sparc/include/asm/linkage.h
similarity index 100%
rename from include/asm-sparc/linkage.h
rename to arch/sparc/include/asm/linkage.h
diff --git a/include/asm-sparc/lmb.h b/arch/sparc/include/asm/lmb.h
similarity index 100%
rename from include/asm-sparc/lmb.h
rename to arch/sparc/include/asm/lmb.h
diff --git a/include/asm-sparc/local.h b/arch/sparc/include/asm/local.h
similarity index 100%
rename from include/asm-sparc/local.h
rename to arch/sparc/include/asm/local.h
diff --git a/include/asm-sparc/lsu.h b/arch/sparc/include/asm/lsu.h
similarity index 100%
rename from include/asm-sparc/lsu.h
rename to arch/sparc/include/asm/lsu.h
diff --git a/include/asm-sparc/machines.h b/arch/sparc/include/asm/machines.h
similarity index 100%
rename from include/asm-sparc/machines.h
rename to arch/sparc/include/asm/machines.h
diff --git a/include/asm-sparc/mbus.h b/arch/sparc/include/asm/mbus.h
similarity index 100%
rename from include/asm-sparc/mbus.h
rename to arch/sparc/include/asm/mbus.h
diff --git a/include/asm-sparc/mc146818rtc.h b/arch/sparc/include/asm/mc146818rtc.h
similarity index 64%
rename from include/asm-sparc/mc146818rtc.h
rename to arch/sparc/include/asm/mc146818rtc.h
index 9ab65c21e9e43..67ed9e3a02357 100644
--- a/include/asm-sparc/mc146818rtc.h
+++ b/arch/sparc/include/asm/mc146818rtc.h
@@ -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
diff --git a/include/asm-sparc/mc146818rtc_32.h b/arch/sparc/include/asm/mc146818rtc_32.h
similarity index 100%
rename from include/asm-sparc/mc146818rtc_32.h
rename to arch/sparc/include/asm/mc146818rtc_32.h
diff --git a/include/asm-sparc/mc146818rtc_64.h b/arch/sparc/include/asm/mc146818rtc_64.h
similarity index 100%
rename from include/asm-sparc/mc146818rtc_64.h
rename to arch/sparc/include/asm/mc146818rtc_64.h
diff --git a/include/asm-sparc/mdesc.h b/arch/sparc/include/asm/mdesc.h
similarity index 100%
rename from include/asm-sparc/mdesc.h
rename to arch/sparc/include/asm/mdesc.h
diff --git a/include/asm-sparc/memreg.h b/arch/sparc/include/asm/memreg.h
similarity index 100%
rename from include/asm-sparc/memreg.h
rename to arch/sparc/include/asm/memreg.h
diff --git a/include/asm-sparc/mman.h b/arch/sparc/include/asm/mman.h
similarity index 100%
rename from include/asm-sparc/mman.h
rename to arch/sparc/include/asm/mman.h
diff --git a/include/asm-sparc/mmu.h b/arch/sparc/include/asm/mmu.h
similarity index 66%
rename from include/asm-sparc/mmu.h
rename to arch/sparc/include/asm/mmu.h
index ee66bf6dcbd6b..88fa313887dba 100644
--- a/include/asm-sparc/mmu.h
+++ b/arch/sparc/include/asm/mmu.h
@@ -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
diff --git a/include/asm-sparc/mmu_32.h b/arch/sparc/include/asm/mmu_32.h
similarity index 100%
rename from include/asm-sparc/mmu_32.h
rename to arch/sparc/include/asm/mmu_32.h
diff --git a/include/asm-sparc/mmu_64.h b/arch/sparc/include/asm/mmu_64.h
similarity index 100%
rename from include/asm-sparc/mmu_64.h
rename to arch/sparc/include/asm/mmu_64.h
diff --git a/include/asm-sparc/mmu_context.h b/arch/sparc/include/asm/mmu_context.h
similarity index 64%
rename from include/asm-sparc/mmu_context.h
rename to arch/sparc/include/asm/mmu_context.h
index e14efb9532ff2..5531346c64f9b 100644
--- a/include/asm-sparc/mmu_context.h
+++ b/arch/sparc/include/asm/mmu_context.h
@@ -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
diff --git a/include/asm-sparc/mmu_context_32.h b/arch/sparc/include/asm/mmu_context_32.h
similarity index 100%
rename from include/asm-sparc/mmu_context_32.h
rename to arch/sparc/include/asm/mmu_context_32.h
diff --git a/include/asm-sparc/mmu_context_64.h b/arch/sparc/include/asm/mmu_context_64.h
similarity index 100%
rename from include/asm-sparc/mmu_context_64.h
rename to arch/sparc/include/asm/mmu_context_64.h
diff --git a/include/asm-sparc/mmzone.h b/arch/sparc/include/asm/mmzone.h
similarity index 100%
rename from include/asm-sparc/mmzone.h
rename to arch/sparc/include/asm/mmzone.h
diff --git a/include/asm-sparc/module.h b/arch/sparc/include/asm/module.h
similarity index 65%
rename from include/asm-sparc/module.h
rename to arch/sparc/include/asm/module.h
index 516138fe681a5..e82cf9a3e60ee 100644
--- a/include/asm-sparc/module.h
+++ b/arch/sparc/include/asm/module.h
@@ -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
diff --git a/include/asm-sparc/module_32.h b/arch/sparc/include/asm/module_32.h
similarity index 100%
rename from include/asm-sparc/module_32.h
rename to arch/sparc/include/asm/module_32.h
diff --git a/include/asm-sparc/module_64.h b/arch/sparc/include/asm/module_64.h
similarity index 100%
rename from include/asm-sparc/module_64.h
rename to arch/sparc/include/asm/module_64.h
diff --git a/include/asm-sparc/mostek.h b/arch/sparc/include/asm/mostek.h
similarity index 65%
rename from include/asm-sparc/mostek.h
rename to arch/sparc/include/asm/mostek.h
index 5b9f7fec7ee74..433be3e0a69b3 100644
--- a/include/asm-sparc/mostek.h
+++ b/arch/sparc/include/asm/mostek.h
@@ -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
diff --git a/include/asm-sparc/mostek_32.h b/arch/sparc/include/asm/mostek_32.h
similarity index 100%
rename from include/asm-sparc/mostek_32.h
rename to arch/sparc/include/asm/mostek_32.h
diff --git a/include/asm-sparc/mostek_64.h b/arch/sparc/include/asm/mostek_64.h
similarity index 100%
rename from include/asm-sparc/mostek_64.h
rename to arch/sparc/include/asm/mostek_64.h
diff --git a/include/asm-sparc/mpmbox.h b/arch/sparc/include/asm/mpmbox.h
similarity index 100%
rename from include/asm-sparc/mpmbox.h
rename to arch/sparc/include/asm/mpmbox.h
diff --git a/include/asm-sparc/msgbuf.h b/arch/sparc/include/asm/msgbuf.h
similarity index 100%
rename from include/asm-sparc/msgbuf.h
rename to arch/sparc/include/asm/msgbuf.h
diff --git a/include/asm-sparc/msi.h b/arch/sparc/include/asm/msi.h
similarity index 100%
rename from include/asm-sparc/msi.h
rename to arch/sparc/include/asm/msi.h
diff --git a/include/asm-sparc/mutex.h b/arch/sparc/include/asm/mutex.h
similarity index 100%
rename from include/asm-sparc/mutex.h
rename to arch/sparc/include/asm/mutex.h
diff --git a/include/asm-sparc/mxcc.h b/arch/sparc/include/asm/mxcc.h
similarity index 100%
rename from include/asm-sparc/mxcc.h
rename to arch/sparc/include/asm/mxcc.h
diff --git a/include/asm-sparc/ns87303.h b/arch/sparc/include/asm/ns87303.h
similarity index 100%
rename from include/asm-sparc/ns87303.h
rename to arch/sparc/include/asm/ns87303.h
diff --git a/include/asm-sparc/obio.h b/arch/sparc/include/asm/obio.h
similarity index 100%
rename from include/asm-sparc/obio.h
rename to arch/sparc/include/asm/obio.h
diff --git a/include/asm-sparc/of_device.h b/arch/sparc/include/asm/of_device.h
similarity index 100%
rename from include/asm-sparc/of_device.h
rename to arch/sparc/include/asm/of_device.h
diff --git a/include/asm-sparc/of_platform.h b/arch/sparc/include/asm/of_platform.h
similarity index 64%
rename from include/asm-sparc/of_platform.h
rename to arch/sparc/include/asm/of_platform.h
index 851eb84d737ef..aa699775ffba8 100644
--- a/include/asm-sparc/of_platform.h
+++ b/arch/sparc/include/asm/of_platform.h
@@ -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
diff --git a/include/asm-sparc/of_platform_32.h b/arch/sparc/include/asm/of_platform_32.h
similarity index 91%
rename from include/asm-sparc/of_platform_32.h
rename to arch/sparc/include/asm/of_platform_32.h
index 38334351c36b0..723f7c9b7411d 100644
--- a/include/asm-sparc/of_platform_32.h
+++ b/arch/sparc/include/asm/of_platform_32.h
@@ -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
diff --git a/include/asm-sparc/of_platform_64.h b/arch/sparc/include/asm/of_platform_64.h
similarity index 91%
rename from include/asm-sparc/of_platform_64.h
rename to arch/sparc/include/asm/of_platform_64.h
index 78aa032b674c4..4f66a5f6342d8 100644
--- a/include/asm-sparc/of_platform_64.h
+++ b/arch/sparc/include/asm/of_platform_64.h
@@ -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
diff --git a/include/asm-sparc/openprom.h b/arch/sparc/include/asm/openprom.h
similarity index 65%
rename from include/asm-sparc/openprom.h
rename to arch/sparc/include/asm/openprom.h
index 8c349f0619946..aaeae905ed3f9 100644
--- a/include/asm-sparc/openprom.h
+++ b/arch/sparc/include/asm/openprom.h
@@ -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
diff --git a/include/asm-sparc/openprom_32.h b/arch/sparc/include/asm/openprom_32.h
similarity index 100%
rename from include/asm-sparc/openprom_32.h
rename to arch/sparc/include/asm/openprom_32.h
diff --git a/include/asm-sparc/openprom_64.h b/arch/sparc/include/asm/openprom_64.h
similarity index 100%
rename from include/asm-sparc/openprom_64.h
rename to arch/sparc/include/asm/openprom_64.h
diff --git a/include/asm-sparc/openpromio.h b/arch/sparc/include/asm/openpromio.h
similarity index 100%
rename from include/asm-sparc/openpromio.h
rename to arch/sparc/include/asm/openpromio.h
diff --git a/include/asm-sparc/oplib.h b/arch/sparc/include/asm/oplib.h
similarity index 65%
rename from include/asm-sparc/oplib.h
rename to arch/sparc/include/asm/oplib.h
index e88d7c04a2922..72e04e13a6b40 100644
--- a/include/asm-sparc/oplib.h
+++ b/arch/sparc/include/asm/oplib.h
@@ -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
diff --git a/include/asm-sparc/oplib_32.h b/arch/sparc/include/asm/oplib_32.h
similarity index 100%
rename from include/asm-sparc/oplib_32.h
rename to arch/sparc/include/asm/oplib_32.h
diff --git a/include/asm-sparc/oplib_64.h b/arch/sparc/include/asm/oplib_64.h
similarity index 100%
rename from include/asm-sparc/oplib_64.h
rename to arch/sparc/include/asm/oplib_64.h
diff --git a/include/asm-sparc/page.h b/arch/sparc/include/asm/page.h
similarity index 66%
rename from include/asm-sparc/page.h
rename to arch/sparc/include/asm/page.h
index f32f49fcf75c7..f21de03490259 100644
--- a/include/asm-sparc/page.h
+++ b/arch/sparc/include/asm/page.h
@@ -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
diff --git a/include/asm-sparc/page_32.h b/arch/sparc/include/asm/page_32.h
similarity index 100%
rename from include/asm-sparc/page_32.h
rename to arch/sparc/include/asm/page_32.h
diff --git a/include/asm-sparc/page_64.h b/arch/sparc/include/asm/page_64.h
similarity index 100%
rename from include/asm-sparc/page_64.h
rename to arch/sparc/include/asm/page_64.h
diff --git a/include/asm-sparc/param.h b/arch/sparc/include/asm/param.h
similarity index 100%
rename from include/asm-sparc/param.h
rename to arch/sparc/include/asm/param.h
diff --git a/include/asm-sparc/parport.h b/arch/sparc/include/asm/parport.h
similarity index 100%
rename from include/asm-sparc/parport.h
rename to arch/sparc/include/asm/parport.h
diff --git a/include/asm-sparc/pbm.h b/arch/sparc/include/asm/pbm.h
similarity index 100%
rename from include/asm-sparc/pbm.h
rename to arch/sparc/include/asm/pbm.h
diff --git a/include/asm-sparc/pci.h b/arch/sparc/include/asm/pci.h
similarity index 66%
rename from include/asm-sparc/pci.h
rename to arch/sparc/include/asm/pci.h
index b807d52a48091..6e14fd179335d 100644
--- a/include/asm-sparc/pci.h
+++ b/arch/sparc/include/asm/pci.h
@@ -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
diff --git a/include/asm-sparc/pci_32.h b/arch/sparc/include/asm/pci_32.h
similarity index 100%
rename from include/asm-sparc/pci_32.h
rename to arch/sparc/include/asm/pci_32.h
diff --git a/include/asm-sparc/pci_64.h b/arch/sparc/include/asm/pci_64.h
similarity index 100%
rename from include/asm-sparc/pci_64.h
rename to arch/sparc/include/asm/pci_64.h
diff --git a/include/asm-sparc/pcic.h b/arch/sparc/include/asm/pcic.h
similarity index 100%
rename from include/asm-sparc/pcic.h
rename to arch/sparc/include/asm/pcic.h
diff --git a/include/asm-sparc/percpu.h b/arch/sparc/include/asm/percpu.h
similarity index 65%
rename from include/asm-sparc/percpu.h
rename to arch/sparc/include/asm/percpu.h
index d98ed6cf2e36c..bfb1d19ff1bf1 100644
--- a/include/asm-sparc/percpu.h
+++ b/arch/sparc/include/asm/percpu.h
@@ -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
diff --git a/include/asm-sparc/percpu_32.h b/arch/sparc/include/asm/percpu_32.h
similarity index 100%
rename from include/asm-sparc/percpu_32.h
rename to arch/sparc/include/asm/percpu_32.h
diff --git a/include/asm-sparc/percpu_64.h b/arch/sparc/include/asm/percpu_64.h
similarity index 100%
rename from include/asm-sparc/percpu_64.h
rename to arch/sparc/include/asm/percpu_64.h
diff --git a/include/asm-sparc/perfctr.h b/arch/sparc/include/asm/perfctr.h
similarity index 100%
rename from include/asm-sparc/perfctr.h
rename to arch/sparc/include/asm/perfctr.h
diff --git a/include/asm-sparc/pgalloc.h b/arch/sparc/include/asm/pgalloc.h
similarity index 65%
rename from include/asm-sparc/pgalloc.h
rename to arch/sparc/include/asm/pgalloc.h
index 7fa02b53d392c..b6db1f7cdcab3 100644
--- a/include/asm-sparc/pgalloc.h
+++ b/arch/sparc/include/asm/pgalloc.h
@@ -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
diff --git a/include/asm-sparc/pgalloc_32.h b/arch/sparc/include/asm/pgalloc_32.h
similarity index 100%
rename from include/asm-sparc/pgalloc_32.h
rename to arch/sparc/include/asm/pgalloc_32.h
diff --git a/include/asm-sparc/pgalloc_64.h b/arch/sparc/include/asm/pgalloc_64.h
similarity index 100%
rename from include/asm-sparc/pgalloc_64.h
rename to arch/sparc/include/asm/pgalloc_64.h
diff --git a/include/asm-sparc/pgtable.h b/arch/sparc/include/asm/pgtable.h
similarity index 65%
rename from include/asm-sparc/pgtable.h
rename to arch/sparc/include/asm/pgtable.h
index 63cdef53bc52e..59ba6f6207322 100644
--- a/include/asm-sparc/pgtable.h
+++ b/arch/sparc/include/asm/pgtable.h
@@ -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
diff --git a/include/asm-sparc/pgtable_32.h b/arch/sparc/include/asm/pgtable_32.h
similarity index 99%
rename from include/asm-sparc/pgtable_32.h
rename to arch/sparc/include/asm/pgtable_32.h
index 781bd4694a1c1..08237fda88743 100644
--- a/include/asm-sparc/pgtable_32.h
+++ b/arch/sparc/include/asm/pgtable_32.h
@@ -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)
diff --git a/include/asm-sparc/pgtable_64.h b/arch/sparc/include/asm/pgtable_64.h
similarity index 100%
rename from include/asm-sparc/pgtable_64.h
rename to arch/sparc/include/asm/pgtable_64.h
diff --git a/include/asm-sparc/pgtsrmmu.h b/arch/sparc/include/asm/pgtsrmmu.h
similarity index 100%
rename from include/asm-sparc/pgtsrmmu.h
rename to arch/sparc/include/asm/pgtsrmmu.h
diff --git a/include/asm-sparc/pgtsun4.h b/arch/sparc/include/asm/pgtsun4.h
similarity index 100%
rename from include/asm-sparc/pgtsun4.h
rename to arch/sparc/include/asm/pgtsun4.h
diff --git a/include/asm-sparc/pgtsun4c.h b/arch/sparc/include/asm/pgtsun4c.h
similarity index 100%
rename from include/asm-sparc/pgtsun4c.h
rename to arch/sparc/include/asm/pgtsun4c.h
diff --git a/include/asm-sparc/pil.h b/arch/sparc/include/asm/pil.h
similarity index 100%
rename from include/asm-sparc/pil.h
rename to arch/sparc/include/asm/pil.h
diff --git a/include/asm-sparc/poll.h b/arch/sparc/include/asm/poll.h
similarity index 100%
rename from include/asm-sparc/poll.h
rename to arch/sparc/include/asm/poll.h
diff --git a/include/asm-sparc/posix_types.h b/arch/sparc/include/asm/posix_types.h
similarity index 64%
rename from include/asm-sparc/posix_types.h
rename to arch/sparc/include/asm/posix_types.h
index 58c820d75e833..03a0e091a884a 100644
--- a/include/asm-sparc/posix_types.h
+++ b/arch/sparc/include/asm/posix_types.h
@@ -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
diff --git a/include/asm-sparc/posix_types_32.h b/arch/sparc/include/asm/posix_types_32.h
similarity index 100%
rename from include/asm-sparc/posix_types_32.h
rename to arch/sparc/include/asm/posix_types_32.h
diff --git a/include/asm-sparc/posix_types_64.h b/arch/sparc/include/asm/posix_types_64.h
similarity index 100%
rename from include/asm-sparc/posix_types_64.h
rename to arch/sparc/include/asm/posix_types_64.h
diff --git a/include/asm-sparc/processor.h b/arch/sparc/include/asm/processor.h
similarity index 64%
rename from include/asm-sparc/processor.h
rename to arch/sparc/include/asm/processor.h
index 11a66bb02eaa0..9da9646bf6c6b 100644
--- a/include/asm-sparc/processor.h
+++ b/arch/sparc/include/asm/processor.h
@@ -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
diff --git a/include/asm-sparc/processor_32.h b/arch/sparc/include/asm/processor_32.h
similarity index 99%
rename from include/asm-sparc/processor_32.h
rename to arch/sparc/include/asm/processor_32.h
index 562c0d69c537a..718e7e0141818 100644
--- a/include/asm-sparc/processor_32.h
+++ b/arch/sparc/include/asm/processor_32.h
@@ -1,4 +1,4 @@
-/* include/asm-sparc/processor.h
+/* include/asm/processor.h
  *
  * Copyright (C) 1994 David S. Miller (davem@caip.rutgers.edu)
  */
diff --git a/include/asm-sparc/processor_64.h b/arch/sparc/include/asm/processor_64.h
similarity index 99%
rename from include/asm-sparc/processor_64.h
rename to arch/sparc/include/asm/processor_64.h
index 70d42801a0d20..137a6bd72fc80 100644
--- a/include/asm-sparc/processor_64.h
+++ b/arch/sparc/include/asm/processor_64.h
@@ -1,5 +1,5 @@
 /*
- * include/asm-sparc64/processor.h
+ * include/asm/processor.h
  *
  * Copyright (C) 1996 David S. Miller (davem@caip.rutgers.edu)
  */
diff --git a/include/asm-sparc/prom.h b/arch/sparc/include/asm/prom.h
similarity index 100%
rename from include/asm-sparc/prom.h
rename to arch/sparc/include/asm/prom.h
diff --git a/include/asm-sparc/psr.h b/arch/sparc/include/asm/psr.h
similarity index 100%
rename from include/asm-sparc/psr.h
rename to arch/sparc/include/asm/psr.h
diff --git a/include/asm-sparc/psrcompat.h b/arch/sparc/include/asm/psrcompat.h
similarity index 100%
rename from include/asm-sparc/psrcompat.h
rename to arch/sparc/include/asm/psrcompat.h
diff --git a/include/asm-sparc/pstate.h b/arch/sparc/include/asm/pstate.h
similarity index 100%
rename from include/asm-sparc/pstate.h
rename to arch/sparc/include/asm/pstate.h
diff --git a/include/asm-sparc/ptrace.h b/arch/sparc/include/asm/ptrace.h
similarity index 65%
rename from include/asm-sparc/ptrace.h
rename to arch/sparc/include/asm/ptrace.h
index f36ab6c30ff30..6dcbe2eed2e20 100644
--- a/include/asm-sparc/ptrace.h
+++ b/arch/sparc/include/asm/ptrace.h
@@ -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
diff --git a/include/asm-sparc/ptrace_32.h b/arch/sparc/include/asm/ptrace_32.h
similarity index 100%
rename from include/asm-sparc/ptrace_32.h
rename to arch/sparc/include/asm/ptrace_32.h
diff --git a/include/asm-sparc/ptrace_64.h b/arch/sparc/include/asm/ptrace_64.h
similarity index 100%
rename from include/asm-sparc/ptrace_64.h
rename to arch/sparc/include/asm/ptrace_64.h
diff --git a/include/asm-sparc/reboot.h b/arch/sparc/include/asm/reboot.h
similarity index 100%
rename from include/asm-sparc/reboot.h
rename to arch/sparc/include/asm/reboot.h
diff --git a/include/asm-sparc/reg.h b/arch/sparc/include/asm/reg.h
similarity index 66%
rename from include/asm-sparc/reg.h
rename to arch/sparc/include/asm/reg.h
index cb34b0a49aad4..0c16e19cae4da 100644
--- a/include/asm-sparc/reg.h
+++ b/arch/sparc/include/asm/reg.h
@@ -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
diff --git a/include/asm-sparc/reg_32.h b/arch/sparc/include/asm/reg_32.h
similarity index 98%
rename from include/asm-sparc/reg_32.h
rename to arch/sparc/include/asm/reg_32.h
index 42fecfcd97e7b..1efb056fb3d15 100644
--- a/include/asm-sparc/reg_32.h
+++ b/arch/sparc/include/asm/reg_32.h
@@ -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
diff --git a/include/asm-sparc/reg_64.h b/arch/sparc/include/asm/reg_64.h
similarity index 97%
rename from include/asm-sparc/reg_64.h
rename to arch/sparc/include/asm/reg_64.h
index eb24a07ff4d56..6f277d7c7d88f 100644
--- a/include/asm-sparc/reg_64.h
+++ b/arch/sparc/include/asm/reg_64.h
@@ -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
diff --git a/include/asm-sparc/resource.h b/arch/sparc/include/asm/resource.h
similarity index 100%
rename from include/asm-sparc/resource.h
rename to arch/sparc/include/asm/resource.h
diff --git a/include/asm-sparc/ross.h b/arch/sparc/include/asm/ross.h
similarity index 100%
rename from include/asm-sparc/ross.h
rename to arch/sparc/include/asm/ross.h
diff --git a/include/asm-sparc/rtc.h b/arch/sparc/include/asm/rtc.h
similarity index 100%
rename from include/asm-sparc/rtc.h
rename to arch/sparc/include/asm/rtc.h
diff --git a/include/asm-sparc/rwsem-const.h b/arch/sparc/include/asm/rwsem-const.h
similarity index 100%
rename from include/asm-sparc/rwsem-const.h
rename to arch/sparc/include/asm/rwsem-const.h
diff --git a/include/asm-sparc/rwsem.h b/arch/sparc/include/asm/rwsem.h
similarity index 100%
rename from include/asm-sparc/rwsem.h
rename to arch/sparc/include/asm/rwsem.h
diff --git a/include/asm-sparc/sbi.h b/arch/sparc/include/asm/sbi.h
similarity index 100%
rename from include/asm-sparc/sbi.h
rename to arch/sparc/include/asm/sbi.h
diff --git a/include/asm-sparc/sbus.h b/arch/sparc/include/asm/sbus.h
similarity index 66%
rename from include/asm-sparc/sbus.h
rename to arch/sparc/include/asm/sbus.h
index 8f29a19796658..f82481ab44db0 100644
--- a/include/asm-sparc/sbus.h
+++ b/arch/sparc/include/asm/sbus.h
@@ -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
diff --git a/include/asm-sparc/sbus_32.h b/arch/sparc/include/asm/sbus_32.h
similarity index 100%
rename from include/asm-sparc/sbus_32.h
rename to arch/sparc/include/asm/sbus_32.h
diff --git a/include/asm-sparc/sbus_64.h b/arch/sparc/include/asm/sbus_64.h
similarity index 100%
rename from include/asm-sparc/sbus_64.h
rename to arch/sparc/include/asm/sbus_64.h
diff --git a/include/asm-sparc/scatterlist.h b/arch/sparc/include/asm/scatterlist.h
similarity index 64%
rename from include/asm-sparc/scatterlist.h
rename to arch/sparc/include/asm/scatterlist.h
index b1a0e316c2b6f..ec21a4517641b 100644
--- a/include/asm-sparc/scatterlist.h
+++ b/arch/sparc/include/asm/scatterlist.h
@@ -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
diff --git a/include/asm-sparc/scatterlist_32.h b/arch/sparc/include/asm/scatterlist_32.h
similarity index 100%
rename from include/asm-sparc/scatterlist_32.h
rename to arch/sparc/include/asm/scatterlist_32.h
diff --git a/include/asm-sparc/scatterlist_64.h b/arch/sparc/include/asm/scatterlist_64.h
similarity index 100%
rename from include/asm-sparc/scatterlist_64.h
rename to arch/sparc/include/asm/scatterlist_64.h
diff --git a/include/asm-sparc/scratchpad.h b/arch/sparc/include/asm/scratchpad.h
similarity index 100%
rename from include/asm-sparc/scratchpad.h
rename to arch/sparc/include/asm/scratchpad.h
diff --git a/include/asm-sparc/seccomp.h b/arch/sparc/include/asm/seccomp.h
similarity index 100%
rename from include/asm-sparc/seccomp.h
rename to arch/sparc/include/asm/seccomp.h
diff --git a/include/asm-sparc/sections.h b/arch/sparc/include/asm/sections.h
similarity index 65%
rename from include/asm-sparc/sections.h
rename to arch/sparc/include/asm/sections.h
index cbd019162425b..c7c69b00967ff 100644
--- a/include/asm-sparc/sections.h
+++ b/arch/sparc/include/asm/sections.h
@@ -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
diff --git a/include/asm-sparc/sections_32.h b/arch/sparc/include/asm/sections_32.h
similarity index 100%
rename from include/asm-sparc/sections_32.h
rename to arch/sparc/include/asm/sections_32.h
diff --git a/include/asm-sparc/sections_64.h b/arch/sparc/include/asm/sections_64.h
similarity index 100%
rename from include/asm-sparc/sections_64.h
rename to arch/sparc/include/asm/sections_64.h
diff --git a/include/asm-sparc/sembuf.h b/arch/sparc/include/asm/sembuf.h
similarity index 100%
rename from include/asm-sparc/sembuf.h
rename to arch/sparc/include/asm/sembuf.h
diff --git a/include/asm-sparc/setup.h b/arch/sparc/include/asm/setup.h
similarity index 100%
rename from include/asm-sparc/setup.h
rename to arch/sparc/include/asm/setup.h
diff --git a/include/asm-sparc/sfafsr.h b/arch/sparc/include/asm/sfafsr.h
similarity index 100%
rename from include/asm-sparc/sfafsr.h
rename to arch/sparc/include/asm/sfafsr.h
diff --git a/include/asm-sparc/sfp-machine.h b/arch/sparc/include/asm/sfp-machine.h
similarity index 64%
rename from include/asm-sparc/sfp-machine.h
rename to arch/sparc/include/asm/sfp-machine.h
index c676fcc2dd277..4ebc3823ed4fe 100644
--- a/include/asm-sparc/sfp-machine.h
+++ b/arch/sparc/include/asm/sfp-machine.h
@@ -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
diff --git a/include/asm-sparc/sfp-machine_32.h b/arch/sparc/include/asm/sfp-machine_32.h
similarity index 100%
rename from include/asm-sparc/sfp-machine_32.h
rename to arch/sparc/include/asm/sfp-machine_32.h
diff --git a/include/asm-sparc/sfp-machine_64.h b/arch/sparc/include/asm/sfp-machine_64.h
similarity index 100%
rename from include/asm-sparc/sfp-machine_64.h
rename to arch/sparc/include/asm/sfp-machine_64.h
diff --git a/include/asm-sparc/shmbuf.h b/arch/sparc/include/asm/shmbuf.h
similarity index 100%
rename from include/asm-sparc/shmbuf.h
rename to arch/sparc/include/asm/shmbuf.h
diff --git a/include/asm-sparc/shmparam.h b/arch/sparc/include/asm/shmparam.h
similarity index 65%
rename from include/asm-sparc/shmparam.h
rename to arch/sparc/include/asm/shmparam.h
index 16fda7e9acc85..8bf0cfe0694f8 100644
--- a/include/asm-sparc/shmparam.h
+++ b/arch/sparc/include/asm/shmparam.h
@@ -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
diff --git a/include/asm-sparc/shmparam_32.h b/arch/sparc/include/asm/shmparam_32.h
similarity index 100%
rename from include/asm-sparc/shmparam_32.h
rename to arch/sparc/include/asm/shmparam_32.h
diff --git a/include/asm-sparc/shmparam_64.h b/arch/sparc/include/asm/shmparam_64.h
similarity index 100%
rename from include/asm-sparc/shmparam_64.h
rename to arch/sparc/include/asm/shmparam_64.h
diff --git a/include/asm-sparc/sigcontext.h b/arch/sparc/include/asm/sigcontext.h
similarity index 64%
rename from include/asm-sparc/sigcontext.h
rename to arch/sparc/include/asm/sigcontext.h
index 82fc7d54a4fa1..e92de7e286b54 100644
--- a/include/asm-sparc/sigcontext.h
+++ b/arch/sparc/include/asm/sigcontext.h
@@ -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
diff --git a/include/asm-sparc/sigcontext_32.h b/arch/sparc/include/asm/sigcontext_32.h
similarity index 100%
rename from include/asm-sparc/sigcontext_32.h
rename to arch/sparc/include/asm/sigcontext_32.h
diff --git a/include/asm-sparc/sigcontext_64.h b/arch/sparc/include/asm/sigcontext_64.h
similarity index 100%
rename from include/asm-sparc/sigcontext_64.h
rename to arch/sparc/include/asm/sigcontext_64.h
diff --git a/include/asm-sparc/siginfo.h b/arch/sparc/include/asm/siginfo.h
similarity index 65%
rename from include/asm-sparc/siginfo.h
rename to arch/sparc/include/asm/siginfo.h
index 2c9fccf4ce18f..bd81f8d7f5ce5 100644
--- a/include/asm-sparc/siginfo.h
+++ b/arch/sparc/include/asm/siginfo.h
@@ -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
diff --git a/include/asm-sparc/siginfo_32.h b/arch/sparc/include/asm/siginfo_32.h
similarity index 100%
rename from include/asm-sparc/siginfo_32.h
rename to arch/sparc/include/asm/siginfo_32.h
diff --git a/include/asm-sparc/siginfo_64.h b/arch/sparc/include/asm/siginfo_64.h
similarity index 100%
rename from include/asm-sparc/siginfo_64.h
rename to arch/sparc/include/asm/siginfo_64.h
diff --git a/include/asm-sparc/signal.h b/arch/sparc/include/asm/signal.h
similarity index 65%
rename from include/asm-sparc/signal.h
rename to arch/sparc/include/asm/signal.h
index 36f5f9e482f72..27ab05dc203e8 100644
--- a/include/asm-sparc/signal.h
+++ b/arch/sparc/include/asm/signal.h
@@ -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
diff --git a/include/asm-sparc/signal_32.h b/arch/sparc/include/asm/signal_32.h
similarity index 100%
rename from include/asm-sparc/signal_32.h
rename to arch/sparc/include/asm/signal_32.h
diff --git a/include/asm-sparc/signal_64.h b/arch/sparc/include/asm/signal_64.h
similarity index 100%
rename from include/asm-sparc/signal_64.h
rename to arch/sparc/include/asm/signal_64.h
diff --git a/include/asm-sparc/smp.h b/arch/sparc/include/asm/smp.h
similarity index 66%
rename from include/asm-sparc/smp.h
rename to arch/sparc/include/asm/smp.h
index 1f9dedfbabd81..b59672d0e19b6 100644
--- a/include/asm-sparc/smp.h
+++ b/arch/sparc/include/asm/smp.h
@@ -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
diff --git a/include/asm-sparc/smp_32.h b/arch/sparc/include/asm/smp_32.h
similarity index 100%
rename from include/asm-sparc/smp_32.h
rename to arch/sparc/include/asm/smp_32.h
diff --git a/include/asm-sparc/smp_64.h b/arch/sparc/include/asm/smp_64.h
similarity index 100%
rename from include/asm-sparc/smp_64.h
rename to arch/sparc/include/asm/smp_64.h
diff --git a/include/asm-sparc/smpprim.h b/arch/sparc/include/asm/smpprim.h
similarity index 100%
rename from include/asm-sparc/smpprim.h
rename to arch/sparc/include/asm/smpprim.h
diff --git a/include/asm-sparc/socket.h b/arch/sparc/include/asm/socket.h
similarity index 100%
rename from include/asm-sparc/socket.h
rename to arch/sparc/include/asm/socket.h
diff --git a/include/asm-sparc/sockios.h b/arch/sparc/include/asm/sockios.h
similarity index 100%
rename from include/asm-sparc/sockios.h
rename to arch/sparc/include/asm/sockios.h
diff --git a/include/asm-sparc/sparsemem.h b/arch/sparc/include/asm/sparsemem.h
similarity index 100%
rename from include/asm-sparc/sparsemem.h
rename to arch/sparc/include/asm/sparsemem.h
diff --git a/include/asm-sparc/spinlock.h b/arch/sparc/include/asm/spinlock.h
similarity index 65%
rename from include/asm-sparc/spinlock.h
rename to arch/sparc/include/asm/spinlock.h
index 3b71c50b72eb1..f276b0036b2c4 100644
--- a/include/asm-sparc/spinlock.h
+++ b/arch/sparc/include/asm/spinlock.h
@@ -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
diff --git a/include/asm-sparc/spinlock_32.h b/arch/sparc/include/asm/spinlock_32.h
similarity index 100%
rename from include/asm-sparc/spinlock_32.h
rename to arch/sparc/include/asm/spinlock_32.h
diff --git a/include/asm-sparc/spinlock_64.h b/arch/sparc/include/asm/spinlock_64.h
similarity index 100%
rename from include/asm-sparc/spinlock_64.h
rename to arch/sparc/include/asm/spinlock_64.h
diff --git a/include/asm-sparc/spinlock_types.h b/arch/sparc/include/asm/spinlock_types.h
similarity index 100%
rename from include/asm-sparc/spinlock_types.h
rename to arch/sparc/include/asm/spinlock_types.h
diff --git a/include/asm-sparc/spitfire.h b/arch/sparc/include/asm/spitfire.h
similarity index 100%
rename from include/asm-sparc/spitfire.h
rename to arch/sparc/include/asm/spitfire.h
diff --git a/include/asm-sparc/sstate.h b/arch/sparc/include/asm/sstate.h
similarity index 100%
rename from include/asm-sparc/sstate.h
rename to arch/sparc/include/asm/sstate.h
diff --git a/include/asm-sparc/stacktrace.h b/arch/sparc/include/asm/stacktrace.h
similarity index 100%
rename from include/asm-sparc/stacktrace.h
rename to arch/sparc/include/asm/stacktrace.h
diff --git a/include/asm-sparc/starfire.h b/arch/sparc/include/asm/starfire.h
similarity index 100%
rename from include/asm-sparc/starfire.h
rename to arch/sparc/include/asm/starfire.h
diff --git a/include/asm-sparc/stat.h b/arch/sparc/include/asm/stat.h
similarity index 66%
rename from include/asm-sparc/stat.h
rename to arch/sparc/include/asm/stat.h
index 9fdcaf8c9cd30..d8153013df727 100644
--- a/include/asm-sparc/stat.h
+++ b/arch/sparc/include/asm/stat.h
@@ -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
diff --git a/include/asm-sparc/stat_32.h b/arch/sparc/include/asm/stat_32.h
similarity index 100%
rename from include/asm-sparc/stat_32.h
rename to arch/sparc/include/asm/stat_32.h
diff --git a/include/asm-sparc/stat_64.h b/arch/sparc/include/asm/stat_64.h
similarity index 100%
rename from include/asm-sparc/stat_64.h
rename to arch/sparc/include/asm/stat_64.h
diff --git a/include/asm-sparc/statfs.h b/arch/sparc/include/asm/statfs.h
similarity index 65%
rename from include/asm-sparc/statfs.h
rename to arch/sparc/include/asm/statfs.h
index a70cc52e7018f..5e937a73743dd 100644
--- a/include/asm-sparc/statfs.h
+++ b/arch/sparc/include/asm/statfs.h
@@ -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
diff --git a/include/asm-sparc/statfs_32.h b/arch/sparc/include/asm/statfs_32.h
similarity index 100%
rename from include/asm-sparc/statfs_32.h
rename to arch/sparc/include/asm/statfs_32.h
diff --git a/include/asm-sparc/statfs_64.h b/arch/sparc/include/asm/statfs_64.h
similarity index 100%
rename from include/asm-sparc/statfs_64.h
rename to arch/sparc/include/asm/statfs_64.h
diff --git a/include/asm-sparc/string.h b/arch/sparc/include/asm/string.h
similarity index 65%
rename from include/asm-sparc/string.h
rename to arch/sparc/include/asm/string.h
index 14c04c7697a5e..98b72a0c8e6e6 100644
--- a/include/asm-sparc/string.h
+++ b/arch/sparc/include/asm/string.h
@@ -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
diff --git a/include/asm-sparc/string_32.h b/arch/sparc/include/asm/string_32.h
similarity index 100%
rename from include/asm-sparc/string_32.h
rename to arch/sparc/include/asm/string_32.h
diff --git a/include/asm-sparc/string_64.h b/arch/sparc/include/asm/string_64.h
similarity index 100%
rename from include/asm-sparc/string_64.h
rename to arch/sparc/include/asm/string_64.h
diff --git a/include/asm-sparc/sun4paddr.h b/arch/sparc/include/asm/sun4paddr.h
similarity index 100%
rename from include/asm-sparc/sun4paddr.h
rename to arch/sparc/include/asm/sun4paddr.h
diff --git a/include/asm-sparc/sun4prom.h b/arch/sparc/include/asm/sun4prom.h
similarity index 100%
rename from include/asm-sparc/sun4prom.h
rename to arch/sparc/include/asm/sun4prom.h
diff --git a/include/asm-sparc/sunbpp.h b/arch/sparc/include/asm/sunbpp.h
similarity index 99%
rename from include/asm-sparc/sunbpp.h
rename to arch/sparc/include/asm/sunbpp.h
index 92ee1a8ff3a27..d81a02eaf78bf 100644
--- a/include/asm-sparc/sunbpp.h
+++ b/arch/sparc/include/asm/sunbpp.h
@@ -1,5 +1,5 @@
 /*
- * include/asm-sparc/sunbpp.h
+ * include/asm/sunbpp.h
  */
 
 #ifndef _ASM_SPARC_SUNBPP_H
diff --git a/include/asm-sparc/swift.h b/arch/sparc/include/asm/swift.h
similarity index 100%
rename from include/asm-sparc/swift.h
rename to arch/sparc/include/asm/swift.h
diff --git a/include/asm-sparc/syscalls.h b/arch/sparc/include/asm/syscalls.h
similarity index 100%
rename from include/asm-sparc/syscalls.h
rename to arch/sparc/include/asm/syscalls.h
diff --git a/include/asm-sparc/sysen.h b/arch/sparc/include/asm/sysen.h
similarity index 100%
rename from include/asm-sparc/sysen.h
rename to arch/sparc/include/asm/sysen.h
diff --git a/include/asm-sparc/system.h b/arch/sparc/include/asm/system.h
similarity index 65%
rename from include/asm-sparc/system.h
rename to arch/sparc/include/asm/system.h
index 15e2a3bc4f615..7944a7cfc9963 100644
--- a/include/asm-sparc/system.h
+++ b/arch/sparc/include/asm/system.h
@@ -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
diff --git a/include/asm-sparc/system_32.h b/arch/sparc/include/asm/system_32.h
similarity index 100%
rename from include/asm-sparc/system_32.h
rename to arch/sparc/include/asm/system_32.h
diff --git a/include/asm-sparc/system_64.h b/arch/sparc/include/asm/system_64.h
similarity index 100%
rename from include/asm-sparc/system_64.h
rename to arch/sparc/include/asm/system_64.h
diff --git a/include/asm-sparc/termbits.h b/arch/sparc/include/asm/termbits.h
similarity index 100%
rename from include/asm-sparc/termbits.h
rename to arch/sparc/include/asm/termbits.h
diff --git a/include/asm-sparc/termios.h b/arch/sparc/include/asm/termios.h
similarity index 100%
rename from include/asm-sparc/termios.h
rename to arch/sparc/include/asm/termios.h
diff --git a/include/asm-sparc/thread_info.h b/arch/sparc/include/asm/thread_info.h
similarity index 64%
rename from include/asm-sparc/thread_info.h
rename to arch/sparc/include/asm/thread_info.h
index 64155cf89f370..122d7acc07e6b 100644
--- a/include/asm-sparc/thread_info.h
+++ b/arch/sparc/include/asm/thread_info.h
@@ -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
diff --git a/include/asm-sparc/thread_info_32.h b/arch/sparc/include/asm/thread_info_32.h
similarity index 100%
rename from include/asm-sparc/thread_info_32.h
rename to arch/sparc/include/asm/thread_info_32.h
diff --git a/include/asm-sparc/thread_info_64.h b/arch/sparc/include/asm/thread_info_64.h
similarity index 100%
rename from include/asm-sparc/thread_info_64.h
rename to arch/sparc/include/asm/thread_info_64.h
diff --git a/include/asm-sparc/timer.h b/arch/sparc/include/asm/timer.h
similarity index 65%
rename from include/asm-sparc/timer.h
rename to arch/sparc/include/asm/timer.h
index 475baa05a96ef..612fd2779d9ea 100644
--- a/include/asm-sparc/timer.h
+++ b/arch/sparc/include/asm/timer.h
@@ -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
diff --git a/include/asm-sparc/timer_32.h b/arch/sparc/include/asm/timer_32.h
similarity index 100%
rename from include/asm-sparc/timer_32.h
rename to arch/sparc/include/asm/timer_32.h
diff --git a/include/asm-sparc/timer_64.h b/arch/sparc/include/asm/timer_64.h
similarity index 100%
rename from include/asm-sparc/timer_64.h
rename to arch/sparc/include/asm/timer_64.h
diff --git a/include/asm-sparc/timex.h b/arch/sparc/include/asm/timex.h
similarity index 65%
rename from include/asm-sparc/timex.h
rename to arch/sparc/include/asm/timex.h
index 01d9f199d4524..70cc37b73827b 100644
--- a/include/asm-sparc/timex.h
+++ b/arch/sparc/include/asm/timex.h
@@ -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
diff --git a/include/asm-sparc/timex_32.h b/arch/sparc/include/asm/timex_32.h
similarity index 89%
rename from include/asm-sparc/timex_32.h
rename to arch/sparc/include/asm/timex_32.h
index 71b45c90ccae3..b6ccdb0d6f7de 100644
--- a/include/asm-sparc/timex_32.h
+++ b/arch/sparc/include/asm/timex_32.h
@@ -1,5 +1,5 @@
 /*
- * linux/include/asm-sparc/timex.h
+ * linux/include/asm/timex.h
  *
  * sparc architecture timex specifications
  */
diff --git a/include/asm-sparc/timex_64.h b/arch/sparc/include/asm/timex_64.h
similarity index 90%
rename from include/asm-sparc/timex_64.h
rename to arch/sparc/include/asm/timex_64.h
index c622535c45600..18b30bc9823b4 100644
--- a/include/asm-sparc/timex_64.h
+++ b/arch/sparc/include/asm/timex_64.h
@@ -1,5 +1,5 @@
 /*
- * linux/include/asm-sparc64/timex.h
+ * linux/include/asm/timex.h
  *
  * sparc64 architecture timex specifications
  */
diff --git a/include/asm-sparc/tlb.h b/arch/sparc/include/asm/tlb.h
similarity index 66%
rename from include/asm-sparc/tlb.h
rename to arch/sparc/include/asm/tlb.h
index a821057327c49..92d0393bbcdc5 100644
--- a/include/asm-sparc/tlb.h
+++ b/arch/sparc/include/asm/tlb.h
@@ -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
diff --git a/include/asm-sparc/tlb_32.h b/arch/sparc/include/asm/tlb_32.h
similarity index 100%
rename from include/asm-sparc/tlb_32.h
rename to arch/sparc/include/asm/tlb_32.h
diff --git a/include/asm-sparc/tlb_64.h b/arch/sparc/include/asm/tlb_64.h
similarity index 100%
rename from include/asm-sparc/tlb_64.h
rename to arch/sparc/include/asm/tlb_64.h
diff --git a/include/asm-sparc/tlbflush.h b/arch/sparc/include/asm/tlbflush.h
similarity index 65%
rename from include/asm-sparc/tlbflush.h
rename to arch/sparc/include/asm/tlbflush.h
index 6e6bc12227b86..2c9629fad1e2c 100644
--- a/include/asm-sparc/tlbflush.h
+++ b/arch/sparc/include/asm/tlbflush.h
@@ -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
diff --git a/include/asm-sparc/tlbflush_32.h b/arch/sparc/include/asm/tlbflush_32.h
similarity index 100%
rename from include/asm-sparc/tlbflush_32.h
rename to arch/sparc/include/asm/tlbflush_32.h
diff --git a/include/asm-sparc/tlbflush_64.h b/arch/sparc/include/asm/tlbflush_64.h
similarity index 100%
rename from include/asm-sparc/tlbflush_64.h
rename to arch/sparc/include/asm/tlbflush_64.h
diff --git a/include/asm-sparc/topology.h b/arch/sparc/include/asm/topology.h
similarity index 65%
rename from include/asm-sparc/topology.h
rename to arch/sparc/include/asm/topology.h
index ed13630f32e25..ee4f191d394aa 100644
--- a/include/asm-sparc/topology.h
+++ b/arch/sparc/include/asm/topology.h
@@ -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
diff --git a/include/asm-sparc/topology_32.h b/arch/sparc/include/asm/topology_32.h
similarity index 100%
rename from include/asm-sparc/topology_32.h
rename to arch/sparc/include/asm/topology_32.h
diff --git a/include/asm-sparc/topology_64.h b/arch/sparc/include/asm/topology_64.h
similarity index 100%
rename from include/asm-sparc/topology_64.h
rename to arch/sparc/include/asm/topology_64.h
diff --git a/include/asm-sparc/traps.h b/arch/sparc/include/asm/traps.h
similarity index 100%
rename from include/asm-sparc/traps.h
rename to arch/sparc/include/asm/traps.h
diff --git a/include/asm-sparc/tsb.h b/arch/sparc/include/asm/tsb.h
similarity index 100%
rename from include/asm-sparc/tsb.h
rename to arch/sparc/include/asm/tsb.h
diff --git a/include/asm-sparc/tsunami.h b/arch/sparc/include/asm/tsunami.h
similarity index 100%
rename from include/asm-sparc/tsunami.h
rename to arch/sparc/include/asm/tsunami.h
diff --git a/include/asm-sparc/ttable.h b/arch/sparc/include/asm/ttable.h
similarity index 100%
rename from include/asm-sparc/ttable.h
rename to arch/sparc/include/asm/ttable.h
diff --git a/include/asm-sparc/turbosparc.h b/arch/sparc/include/asm/turbosparc.h
similarity index 100%
rename from include/asm-sparc/turbosparc.h
rename to arch/sparc/include/asm/turbosparc.h
diff --git a/include/asm-sparc/types.h b/arch/sparc/include/asm/types.h
similarity index 100%
rename from include/asm-sparc/types.h
rename to arch/sparc/include/asm/types.h
diff --git a/include/asm-sparc/uaccess.h b/arch/sparc/include/asm/uaccess.h
similarity index 65%
rename from include/asm-sparc/uaccess.h
rename to arch/sparc/include/asm/uaccess.h
index 424facce52387..e88fbe5c0457a 100644
--- a/include/asm-sparc/uaccess.h
+++ b/arch/sparc/include/asm/uaccess.h
@@ -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
diff --git a/include/asm-sparc/uaccess_32.h b/arch/sparc/include/asm/uaccess_32.h
similarity index 100%
rename from include/asm-sparc/uaccess_32.h
rename to arch/sparc/include/asm/uaccess_32.h
diff --git a/include/asm-sparc/uaccess_64.h b/arch/sparc/include/asm/uaccess_64.h
similarity index 100%
rename from include/asm-sparc/uaccess_64.h
rename to arch/sparc/include/asm/uaccess_64.h
diff --git a/include/asm-sparc/uctx.h b/arch/sparc/include/asm/uctx.h
similarity index 100%
rename from include/asm-sparc/uctx.h
rename to arch/sparc/include/asm/uctx.h
diff --git a/include/asm-sparc/unaligned.h b/arch/sparc/include/asm/unaligned.h
similarity index 100%
rename from include/asm-sparc/unaligned.h
rename to arch/sparc/include/asm/unaligned.h
diff --git a/include/asm-sparc/unistd.h b/arch/sparc/include/asm/unistd.h
similarity index 65%
rename from include/asm-sparc/unistd.h
rename to arch/sparc/include/asm/unistd.h
index 3c2609618a099..4207fb362da03 100644
--- a/include/asm-sparc/unistd.h
+++ b/arch/sparc/include/asm/unistd.h
@@ -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
diff --git a/include/asm-sparc/unistd_32.h b/arch/sparc/include/asm/unistd_32.h
similarity index 100%
rename from include/asm-sparc/unistd_32.h
rename to arch/sparc/include/asm/unistd_32.h
diff --git a/include/asm-sparc/unistd_64.h b/arch/sparc/include/asm/unistd_64.h
similarity index 100%
rename from include/asm-sparc/unistd_64.h
rename to arch/sparc/include/asm/unistd_64.h
diff --git a/include/asm-sparc/upa.h b/arch/sparc/include/asm/upa.h
similarity index 100%
rename from include/asm-sparc/upa.h
rename to arch/sparc/include/asm/upa.h
diff --git a/include/asm-sparc/user.h b/arch/sparc/include/asm/user.h
similarity index 100%
rename from include/asm-sparc/user.h
rename to arch/sparc/include/asm/user.h
diff --git a/include/asm-sparc/utrap.h b/arch/sparc/include/asm/utrap.h
similarity index 97%
rename from include/asm-sparc/utrap.h
rename to arch/sparc/include/asm/utrap.h
index 9da37babbe5b8..b10e527c22d96 100644
--- a/include/asm-sparc/utrap.h
+++ b/arch/sparc/include/asm/utrap.h
@@ -1,5 +1,5 @@
 /*
- * include/asm-sparc64/utrap.h
+ * include/asm/utrap.h
  *
  * Copyright (C) 1997 Jakub Jelinek (jj@sunsite.mff.cuni.cz)
  */
diff --git a/include/asm-sparc/vac-ops.h b/arch/sparc/include/asm/vac-ops.h
similarity index 100%
rename from include/asm-sparc/vac-ops.h
rename to arch/sparc/include/asm/vac-ops.h
diff --git a/include/asm-sparc/vaddrs.h b/arch/sparc/include/asm/vaddrs.h
similarity index 97%
rename from include/asm-sparc/vaddrs.h
rename to arch/sparc/include/asm/vaddrs.h
index a22fed5a3c6be..541e13755cecb 100644
--- a/include/asm-sparc/vaddrs.h
+++ b/arch/sparc/include/asm/vaddrs.h
@@ -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)
diff --git a/include/asm-sparc/vfc_ioctls.h b/arch/sparc/include/asm/vfc_ioctls.h
similarity index 100%
rename from include/asm-sparc/vfc_ioctls.h
rename to arch/sparc/include/asm/vfc_ioctls.h
diff --git a/include/asm-sparc/vga.h b/arch/sparc/include/asm/vga.h
similarity index 100%
rename from include/asm-sparc/vga.h
rename to arch/sparc/include/asm/vga.h
diff --git a/include/asm-sparc/viking.h b/arch/sparc/include/asm/viking.h
similarity index 100%
rename from include/asm-sparc/viking.h
rename to arch/sparc/include/asm/viking.h
diff --git a/include/asm-sparc/vio.h b/arch/sparc/include/asm/vio.h
similarity index 100%
rename from include/asm-sparc/vio.h
rename to arch/sparc/include/asm/vio.h
diff --git a/include/asm-sparc/visasm.h b/arch/sparc/include/asm/visasm.h
similarity index 100%
rename from include/asm-sparc/visasm.h
rename to arch/sparc/include/asm/visasm.h
diff --git a/include/asm-sparc/watchdog.h b/arch/sparc/include/asm/watchdog.h
similarity index 100%
rename from include/asm-sparc/watchdog.h
rename to arch/sparc/include/asm/watchdog.h
diff --git a/include/asm-sparc/winmacro.h b/arch/sparc/include/asm/winmacro.h
similarity index 100%
rename from include/asm-sparc/winmacro.h
rename to arch/sparc/include/asm/winmacro.h
diff --git a/include/asm-sparc/xor.h b/arch/sparc/include/asm/xor.h
similarity index 66%
rename from include/asm-sparc/xor.h
rename to arch/sparc/include/asm/xor.h
index 35089a838c3f9..8ed591c7db2dc 100644
--- a/include/asm-sparc/xor.h
+++ b/arch/sparc/include/asm/xor.h
@@ -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
diff --git a/include/asm-sparc/xor_32.h b/arch/sparc/include/asm/xor_32.h
similarity index 99%
rename from include/asm-sparc/xor_32.h
rename to arch/sparc/include/asm/xor_32.h
index f34b2cfa82069..44bfa0787f3ff 100644
--- a/include/asm-sparc/xor_32.h
+++ b/arch/sparc/include/asm/xor_32.h
@@ -1,5 +1,5 @@
 /*
- * include/asm-sparc/xor.h
+ * include/asm/xor.h
  *
  * Optimized RAID-5 checksumming functions for 32-bit Sparc.
  *
diff --git a/include/asm-sparc/xor_64.h b/arch/sparc/include/asm/xor_64.h
similarity index 98%
rename from include/asm-sparc/xor_64.h
rename to arch/sparc/include/asm/xor_64.h
index a0233884fc94c..bee4bf4be3af8 100644
--- a/include/asm-sparc/xor_64.h
+++ b/arch/sparc/include/asm/xor_64.h
@@ -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
diff --git a/arch/sparc64/kernel/compat_audit.c b/arch/sparc64/kernel/compat_audit.c
index c1979482aa929..c831b0a4e660b 100644
--- a/arch/sparc64/kernel/compat_audit.c
+++ b/arch/sparc64/kernel/compat_audit.c
@@ -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
index 6cdaf9d33b386..0000000000000
--- a/include/asm-sparc64/Kbuild
+++ /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
index eb8d4b3f51639..0000000000000
--- a/include/asm-sparc64/agp.h
+++ /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
index 5e236ca6e492c..0000000000000
--- a/include/asm-sparc64/apb.h
+++ /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
index 9b7110c516e8e..0000000000000
--- a/include/asm-sparc64/asi.h
+++ /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
index f5126826ba342..0000000000000
--- a/include/asm-sparc64/atomic.h
+++ /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
index 46c9042f30b4d..0000000000000
--- a/include/asm-sparc64/auxio.h
+++ /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
index 1f45c67d73165..0000000000000
--- a/include/asm-sparc64/auxvec.h
+++ /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
index 8ee26d947e0e7..0000000000000
--- a/include/asm-sparc64/backoff.h
+++ /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
index 06e8b63065148..0000000000000
--- a/include/asm-sparc64/bbc.h
+++ /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
index 204404355bddc..0000000000000
--- a/include/asm-sparc64/bitops.h
+++ /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
index 514eee20272e8..0000000000000
--- a/include/asm-sparc64/bpp.h
+++ /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
index 3433737c7a67c..0000000000000
--- a/include/asm-sparc64/bug.h
+++ /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
index 04ae9e2818cf8..0000000000000
--- a/include/asm-sparc64/bugs.h
+++ /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
index f672855bee175..0000000000000
--- a/include/asm-sparc64/byteorder.h
+++ /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
index fa9de5cadbf14..0000000000000
--- a/include/asm-sparc64/cache.h
+++ /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
index cf5b6b3e8a552..0000000000000
--- a/include/asm-sparc64/cacheflush.h
+++ /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
index aaab97562a397..0000000000000
--- a/include/asm-sparc64/chafsr.h
+++ /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
index c3966c5e29d8a..0000000000000
--- a/include/asm-sparc64/checksum.h
+++ /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
index eb757b483b309..0000000000000
--- a/include/asm-sparc64/chmctrl.h
+++ /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
index b19b445cb8102..0000000000000
--- a/include/asm-sparc64/cmt.h
+++ /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
index 8c155d221952e..0000000000000
--- a/include/asm-sparc64/compat.h
+++ /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
index 7187dcc8cac75..0000000000000
--- a/include/asm-sparc64/compat_signal.h
+++ /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
index 3220e134a579d..0000000000000
--- a/include/asm-sparc64/cpudata.h
+++ /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
index 435f37a92f7cd..0000000000000
--- a/include/asm-sparc64/cputime.h
+++ /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
index a7904a7f53a85..0000000000000
--- a/include/asm-sparc64/current.h
+++ /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
index d67613b1f5fe5..0000000000000
--- a/include/asm-sparc64/dcr.h
+++ /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
index 28853f4968d11..0000000000000
--- a/include/asm-sparc64/dcu.h
+++ /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
index 33dc5589d841a..0000000000000
--- a/include/asm-sparc64/delay.h
+++ /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
index 4145c47097e28..0000000000000
--- a/include/asm-sparc64/device.h
+++ /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
index e74f046b41def..0000000000000
--- a/include/asm-sparc64/display7seg.h
+++ /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
index 928c94f99ecf7..0000000000000
--- a/include/asm-sparc64/div64.h
+++ /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
index 380b7b63147ff..0000000000000
--- a/include/asm-sparc64/dma-mapping.h
+++ /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
index 2e36248e6b59d..0000000000000
--- a/include/asm-sparc64/dma.h
+++ /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
index d7d476158bd5b..0000000000000
--- a/include/asm-sparc64/ebus.h
+++ /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
index f256d9472c828..0000000000000
--- a/include/asm-sparc64/elf.h
+++ /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
index 2cac7b644da8a..0000000000000
--- a/include/asm-sparc64/emergency-restart.h
+++ /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
index a2cc0ca334bae..0000000000000
--- a/include/asm-sparc64/envctrl.h
+++ /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
index 9701fe01cc533..0000000000000
--- a/include/asm-sparc64/errno.h
+++ /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
index bedd0ef5f19cd..0000000000000
--- a/include/asm-sparc64/estate.h
+++ /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
index 1c2ac5832f399..0000000000000
--- a/include/asm-sparc64/fb.h
+++ /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
index c17edf8c7bc4d..0000000000000
--- a/include/asm-sparc64/fbio.h
+++ /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
index 8b1beae48cd1a..0000000000000
--- a/include/asm-sparc64/fcntl.h
+++ /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
index 73eb04c19c47f..0000000000000
--- a/include/asm-sparc64/fhc.h
+++ /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
index 214878114436d..0000000000000
--- a/include/asm-sparc64/floppy.h
+++ /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
index 30d6d0f68bc3b..0000000000000
--- a/include/asm-sparc64/fpumacro.h
+++ /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
index 1ceb0bb2fe53e..0000000000000
--- a/include/asm-sparc64/futex.h
+++ /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
index 63dca3db11f33..0000000000000
--- a/include/asm-sparc64/hardirq.h
+++ /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
index 2254c09e53f9d..0000000000000
--- a/include/asm-sparc64/head.h
+++ /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
index 21d8f0a9c2430..0000000000000
--- a/include/asm-sparc64/hugetlb.h
+++ /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
index fb46bfe934a77..0000000000000
--- a/include/asm-sparc64/hvtramp.h
+++ /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
index 16920a291f51a..0000000000000
--- a/include/asm-sparc64/hw_irq.h
+++ /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
index fe7e51a9e429e..0000000000000
--- a/include/asm-sparc64/hypervisor.h
+++ /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
index 7125317a428d3..0000000000000
--- a/include/asm-sparc64/ide.h
+++ /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
index c22f9c30bc78e..0000000000000
--- a/include/asm-sparc64/idprom.h
+++ /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
index f7225015b3db0..0000000000000
--- a/include/asm-sparc64/intr_queue.h
+++ /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
index 25ff258dfd33d..0000000000000
--- a/include/asm-sparc64/io.h
+++ /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
index 18fc5623ff51e..0000000000000
--- a/include/asm-sparc64/ioctl.h
+++ /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
index dcd5540ec1031..0000000000000
--- a/include/asm-sparc64/ioctls.h
+++ /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
index 76252bb85e979..0000000000000
--- a/include/asm-sparc64/iommu.h
+++ /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
index 41dfaf1149b5b..0000000000000
--- a/include/asm-sparc64/ipcbuf.h
+++ /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
index b2102e65947cd..0000000000000
--- a/include/asm-sparc64/irq.h
+++ /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
index 1e2b8a1e745ae..0000000000000
--- a/include/asm-sparc64/irq_regs.h
+++ /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
index 27b091fc3fa09..0000000000000
--- a/include/asm-sparc64/irqflags.h
+++ /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
index 78cfd5d2749b6..0000000000000
--- a/include/asm-sparc64/kdebug.h
+++ /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
index aa6532fd3a13f..0000000000000
--- a/include/asm-sparc64/kgdb.h
+++ /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
index 276530cf5395e..0000000000000
--- a/include/asm-sparc64/kmap_types.h
+++ /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
index c55e43e4d2a4a..0000000000000
--- a/include/asm-sparc64/kprobes.h
+++ /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
index 40f3f231c4575..0000000000000
--- a/include/asm-sparc64/ldc.h
+++ /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
index 3ea4fd13f193c..0000000000000
--- a/include/asm-sparc64/linkage.h
+++ /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
index 3d04981701e2e..0000000000000
--- a/include/asm-sparc64/lmb.h
+++ /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
index c11c530f74d02..0000000000000
--- a/include/asm-sparc64/local.h
+++ /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
index 4e3d8b128a588..0000000000000
--- a/include/asm-sparc64/lsu.h
+++ /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
index 97842e6ed1c2f..0000000000000
--- a/include/asm-sparc64/mc146818rtc.h
+++ /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
index 165a193472862..0000000000000
--- a/include/asm-sparc64/mdesc.h
+++ /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
index 17ddb1724f516..0000000000000
--- a/include/asm-sparc64/mman.h
+++ /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
index e677a64d8db15..0000000000000
--- a/include/asm-sparc64/mmu.h
+++ /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
index 877fee94bd4e6..0000000000000
--- a/include/asm-sparc64/mmu_context.h
+++ /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
index 43a710f7892a6..0000000000000
--- a/include/asm-sparc64/mmzone.h
+++ /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
index a9606db55e4a2..0000000000000
--- a/include/asm-sparc64/module.h
+++ /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
index 95a752f7e8750..0000000000000
--- a/include/asm-sparc64/mostek.h
+++ /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
index 5b33cc9d9bfb1..0000000000000
--- a/include/asm-sparc64/msgbuf.h
+++ /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
index c0c0f8f260d60..0000000000000
--- a/include/asm-sparc64/mutex.h
+++ /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
index 5f369d4df3dbf..0000000000000
--- a/include/asm-sparc64/ns87303.h
+++ /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
index a769fdbe164a8..0000000000000
--- a/include/asm-sparc64/of_device.h
+++ /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
index f7c427b8bc61a..0000000000000
--- a/include/asm-sparc64/of_platform.h
+++ /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
index acf4b234fae38..0000000000000
--- a/include/asm-sparc64/openprom.h
+++ /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
index 122fabda21f1e..0000000000000
--- a/include/asm-sparc64/openpromio.h
+++ /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
index d93e44e63510e..0000000000000
--- a/include/asm-sparc64/oplib.h
+++ /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
index f46c1fb53028f..0000000000000
--- a/include/asm-sparc64/page.h
+++ /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
index 40c6dc1108220..0000000000000
--- a/include/asm-sparc64/param.h
+++ /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
index b4e4ca812eb62..0000000000000
--- a/include/asm-sparc64/parport.h
+++ /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
index da54c4d1f39cb..0000000000000
--- a/include/asm-sparc64/pci.h
+++ /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
index 292729bb350f8..0000000000000
--- a/include/asm-sparc64/percpu.h
+++ /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
index 52073a9f8e306..0000000000000
--- a/include/asm-sparc64/perfctr.h
+++ /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
index bec31641011c1..0000000000000
--- a/include/asm-sparc64/pgalloc.h
+++ /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
index 9decbd99aefff..0000000000000
--- a/include/asm-sparc64/pgtable.h
+++ /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
index d805f33f1e0fb..0000000000000
--- a/include/asm-sparc64/pil.h
+++ /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
index 8e2f31b4641ac..0000000000000
--- a/include/asm-sparc64/poll.h
+++ /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
index 8cee99200232c..0000000000000
--- a/include/asm-sparc64/posix_types.h
+++ /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
index 21de6cc182ebe..0000000000000
--- a/include/asm-sparc64/processor.h
+++ /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
index 5fa166ee3ffa3..0000000000000
--- a/include/asm-sparc64/prom.h
+++ /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
index 587846f48358a..0000000000000
--- a/include/asm-sparc64/psrcompat.h
+++ /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
index 3ccf0be253602..0000000000000
--- a/include/asm-sparc64/pstate.h
+++ /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
index 1a55b9fb3b0c9..0000000000000
--- a/include/asm-sparc64/ptrace.h
+++ /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
index 0d72eb811cc8f..0000000000000
--- a/include/asm-sparc64/reboot.h
+++ /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
index 495bab27da078..0000000000000
--- a/include/asm-sparc64/reg.h
+++ /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
index 46e3bc0de476c..0000000000000
--- a/include/asm-sparc64/resource.h
+++ /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
index e49a9685aead1..0000000000000
--- a/include/asm-sparc64/rtc.h
+++ /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
index 2a1de315c86a2..0000000000000
--- a/include/asm-sparc64/rwsem-const.h
+++ /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
index 6943c56ed087f..0000000000000
--- a/include/asm-sparc64/rwsem.h
+++ /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
index 0cab0e89b874e..0000000000000
--- a/include/asm-sparc64/sbus.h
+++ /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
index b7fef95953ca3..0000000000000
--- a/include/asm-sparc64/scatterlist.h
+++ /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
index 23675f6a915aa..0000000000000
--- a/include/asm-sparc64/scratchpad.h
+++ /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
index f22f02a08a61a..0000000000000
--- a/include/asm-sparc64/seccomp.h
+++ /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
index 721496f8b2be5..0000000000000
--- a/include/asm-sparc64/sections.h
+++ /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
index c55b952141365..0000000000000
--- a/include/asm-sparc64/sembuf.h
+++ /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
index 7143d06b2c55f..0000000000000
--- a/include/asm-sparc64/setup.h
+++ /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
index 8036fc377a4de..0000000000000
--- a/include/asm-sparc64/sfafsr.h
+++ /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
index 7bbc4fecdc7d5..0000000000000
--- a/include/asm-sparc64/sfp-machine.h
+++ /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
index 0c54a2d68681b..0000000000000
--- a/include/asm-sparc64/shmbuf.h
+++ /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
index 5fa3a9b05e7fc..0000000000000
--- a/include/asm-sparc64/shmparam.h
+++ /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
index 5b16dcce44f24..0000000000000
--- a/include/asm-sparc64/sigcontext.h
+++ /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
index 8ffd6ebabc7aa..0000000000000
--- a/include/asm-sparc64/siginfo.h
+++ /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
index 79705e5d49c34..0000000000000
--- a/include/asm-sparc64/signal.h
+++ /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
index 5095a2cbea521..0000000000000
--- a/include/asm-sparc64/smp.h
+++ /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
index 13e0d5d94bb34..0000000000000
--- a/include/asm-sparc64/socket.h
+++ /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
index 2cb4b641482cd..0000000000000
--- a/include/asm-sparc64/sockios.h
+++ /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
index e681f22a97ae6..0000000000000
--- a/include/asm-sparc64/sparsemem.h
+++ /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
index 0115b8156eb8d..0000000000000
--- a/include/asm-sparc64/spinlock.h
+++ /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
index 48d81c8734b5a..0000000000000
--- a/include/asm-sparc64/spinlock_types.h
+++ /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
index 4430d2fbb0dcc..0000000000000
--- a/include/asm-sparc64/spitfire.h
+++ /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
index 97720ce2fd434..0000000000000
--- a/include/asm-sparc64/sstate.h
+++ /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
index adc9b92c0ef14..0000000000000
--- a/include/asm-sparc64/stacktrace.h
+++ /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
index db97daa3bed48..0000000000000
--- a/include/asm-sparc64/starfire.h
+++ /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
index b108a866256b8..0000000000000
--- a/include/asm-sparc64/stat.h
+++ /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
index 5503d6a4c67ee..0000000000000
--- a/include/asm-sparc64/statfs.h
+++ /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
index 5018cd8b6ad04..0000000000000
--- a/include/asm-sparc64/string.h
+++ /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
index 9632be290eb55..0000000000000
--- a/include/asm-sparc64/sunbpp.h
+++ /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
index 3477b16e30cac..0000000000000
--- a/include/asm-sparc64/syscalls.h
+++ /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
index be2603c2e527d..0000000000000
--- a/include/asm-sparc64/system.h
+++ /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
index e03f97592c708..0000000000000
--- a/include/asm-sparc64/termbits.h
+++ /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
index 940495eb05cc0..0000000000000
--- a/include/asm-sparc64/termios.h
+++ /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
index 92bed79133959..0000000000000
--- a/include/asm-sparc64/thread_info.h
+++ /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
index 88026d83cc937..0000000000000
--- a/include/asm-sparc64/timer.h
+++ /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
index 8dd59ee24b48d..0000000000000
--- a/include/asm-sparc64/timex.h
+++ /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
index ae92fce109364..0000000000000
--- a/include/asm-sparc64/tlb.h
+++ /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
index a43979a06cd90..0000000000000
--- a/include/asm-sparc64/tlbflush.h
+++ /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
index 46999b60fbbab..0000000000000
--- a/include/asm-sparc64/topology.h
+++ /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
index 3677a302ea3ee..0000000000000
--- a/include/asm-sparc64/tsb.h
+++ /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
index a550f1bf6f9bb..0000000000000
--- a/include/asm-sparc64/ttable.h
+++ /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
index cfbfad5043eb9..0000000000000
--- a/include/asm-sparc64/types.h
+++ /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
index 2872d22844f36..0000000000000
--- a/include/asm-sparc64/uaccess.h
+++ /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
index 9e1b5794b07fc..0000000000000
--- a/include/asm-sparc64/uctx.h
+++ /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
index 19fbf9508acf7..0000000000000
--- a/include/asm-sparc64/unaligned.h
+++ /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
index ad86e0b7a4555..0000000000000
--- a/include/asm-sparc64/unistd.h
+++ /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
index aab72930815a0..0000000000000
--- a/include/asm-sparc64/upa.h
+++ /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
index 29fc6e906c298..0000000000000
--- a/include/asm-sparc64/user.h
+++ /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
index b030a41f1895f..0000000000000
--- a/include/asm-sparc64/utrap.h
+++ /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
index fbf4d58a56f02..0000000000000
--- a/include/asm-sparc64/vga.h
+++ /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
index 299b26ab81a7e..0000000000000
--- a/include/asm-sparc64/vio.h
+++ /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
index 837a12278f4ac..0000000000000
--- a/include/asm-sparc64/visasm.h
+++ /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
index b0f2857145f7a..0000000000000
--- a/include/asm-sparc64/watchdog.h
+++ /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
index ef187cc07ed5b..0000000000000
--- a/include/asm-sparc64/xor.h
+++ /dev/null
@@ -1 +0,0 @@
-#include <asm-sparc/xor.h>
-- 
GitLab