aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2008-08-01 14:59:11 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2008-08-01 14:59:11 -0700
commit2b12a4c524812fb3f6ee590a02e65b95c8c32229 (patch)
tree6d319a371c56798d2d5c3ad21801eba142a1c77e
parent4744b43431e8613f920c5cba88346756f53c5165 (diff)
parent7f30491ccd28627742e37899453ae20e3da8e18f (diff)
Merge branch 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux-2.6
* 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux-2.6: [IA64] Move include/asm-ia64 to arch/ia64/include/asm
-rw-r--r--arch/ia64/include/asm/Kbuild (renamed from include/asm-ia64/Kbuild)0
-rw-r--r--arch/ia64/include/asm/a.out.h (renamed from include/asm-ia64/a.out.h)0
-rw-r--r--arch/ia64/include/asm/acpi-ext.h (renamed from include/asm-ia64/acpi-ext.h)0
-rw-r--r--arch/ia64/include/asm/acpi.h (renamed from include/asm-ia64/acpi.h)2
-rw-r--r--arch/ia64/include/asm/agp.h (renamed from include/asm-ia64/agp.h)0
-rw-r--r--arch/ia64/include/asm/asmmacro.h (renamed from include/asm-ia64/asmmacro.h)0
-rw-r--r--arch/ia64/include/asm/atomic.h (renamed from include/asm-ia64/atomic.h)0
-rw-r--r--arch/ia64/include/asm/auxvec.h (renamed from include/asm-ia64/auxvec.h)0
-rw-r--r--arch/ia64/include/asm/bitops.h (renamed from include/asm-ia64/bitops.h)0
-rw-r--r--arch/ia64/include/asm/break.h (renamed from include/asm-ia64/break.h)0
-rw-r--r--arch/ia64/include/asm/bug.h (renamed from include/asm-ia64/bug.h)0
-rw-r--r--arch/ia64/include/asm/bugs.h (renamed from include/asm-ia64/bugs.h)0
-rw-r--r--arch/ia64/include/asm/byteorder.h (renamed from include/asm-ia64/byteorder.h)0
-rw-r--r--arch/ia64/include/asm/cache.h (renamed from include/asm-ia64/cache.h)0
-rw-r--r--arch/ia64/include/asm/cacheflush.h (renamed from include/asm-ia64/cacheflush.h)0
-rw-r--r--arch/ia64/include/asm/checksum.h (renamed from include/asm-ia64/checksum.h)0
-rw-r--r--arch/ia64/include/asm/compat.h (renamed from include/asm-ia64/compat.h)0
-rw-r--r--arch/ia64/include/asm/cpu.h (renamed from include/asm-ia64/cpu.h)0
-rw-r--r--arch/ia64/include/asm/cputime.h (renamed from include/asm-ia64/cputime.h)3
-rw-r--r--arch/ia64/include/asm/current.h (renamed from include/asm-ia64/current.h)0
-rw-r--r--arch/ia64/include/asm/cyclone.h (renamed from include/asm-ia64/cyclone.h)0
-rw-r--r--arch/ia64/include/asm/delay.h (renamed from include/asm-ia64/delay.h)0
-rw-r--r--arch/ia64/include/asm/device.h (renamed from include/asm-ia64/device.h)0
-rw-r--r--arch/ia64/include/asm/div64.h (renamed from include/asm-ia64/div64.h)0
-rw-r--r--arch/ia64/include/asm/dma-mapping.h (renamed from include/asm-ia64/dma-mapping.h)0
-rw-r--r--arch/ia64/include/asm/dma.h (renamed from include/asm-ia64/dma.h)0
-rw-r--r--arch/ia64/include/asm/dmi.h (renamed from include/asm-ia64/dmi.h)0
-rw-r--r--arch/ia64/include/asm/elf.h (renamed from include/asm-ia64/elf.h)0
-rw-r--r--arch/ia64/include/asm/emergency-restart.h (renamed from include/asm-ia64/emergency-restart.h)0
-rw-r--r--arch/ia64/include/asm/errno.h (renamed from include/asm-ia64/errno.h)0
-rw-r--r--arch/ia64/include/asm/esi.h (renamed from include/asm-ia64/esi.h)0
-rw-r--r--arch/ia64/include/asm/fb.h (renamed from include/asm-ia64/fb.h)0
-rw-r--r--arch/ia64/include/asm/fcntl.h (renamed from include/asm-ia64/fcntl.h)0
-rw-r--r--arch/ia64/include/asm/fpswa.h (renamed from include/asm-ia64/fpswa.h)0
-rw-r--r--arch/ia64/include/asm/fpu.h (renamed from include/asm-ia64/fpu.h)0
-rw-r--r--arch/ia64/include/asm/futex.h (renamed from include/asm-ia64/futex.h)0
-rw-r--r--arch/ia64/include/asm/gcc_intrin.h (renamed from include/asm-ia64/gcc_intrin.h)0
-rw-r--r--arch/ia64/include/asm/hardirq.h (renamed from include/asm-ia64/hardirq.h)0
-rw-r--r--arch/ia64/include/asm/hpsim.h (renamed from include/asm-ia64/hpsim.h)0
-rw-r--r--arch/ia64/include/asm/hugetlb.h (renamed from include/asm-ia64/hugetlb.h)0
-rw-r--r--arch/ia64/include/asm/hw_irq.h (renamed from include/asm-ia64/hw_irq.h)0
-rw-r--r--arch/ia64/include/asm/ia32.h (renamed from include/asm-ia64/ia32.h)0
-rw-r--r--arch/ia64/include/asm/ia64regs.h (renamed from include/asm-ia64/ia64regs.h)0
-rw-r--r--arch/ia64/include/asm/intel_intrin.h (renamed from include/asm-ia64/intel_intrin.h)0
-rw-r--r--arch/ia64/include/asm/intrinsics.h (renamed from include/asm-ia64/intrinsics.h)0
-rw-r--r--arch/ia64/include/asm/io.h (renamed from include/asm-ia64/io.h)0
-rw-r--r--arch/ia64/include/asm/ioctl.h (renamed from include/asm-ia64/ioctl.h)0
-rw-r--r--arch/ia64/include/asm/ioctls.h (renamed from include/asm-ia64/ioctls.h)0
-rw-r--r--arch/ia64/include/asm/iosapic.h (renamed from include/asm-ia64/iosapic.h)0
-rw-r--r--arch/ia64/include/asm/ipcbuf.h (renamed from include/asm-ia64/ipcbuf.h)0
-rw-r--r--arch/ia64/include/asm/irq.h (renamed from include/asm-ia64/irq.h)0
-rw-r--r--arch/ia64/include/asm/irq_regs.h (renamed from include/asm-ia64/irq_regs.h)0
-rw-r--r--arch/ia64/include/asm/kdebug.h (renamed from include/asm-ia64/kdebug.h)2
-rw-r--r--arch/ia64/include/asm/kexec.h (renamed from include/asm-ia64/kexec.h)0
-rw-r--r--arch/ia64/include/asm/kmap_types.h (renamed from include/asm-ia64/kmap_types.h)0
-rw-r--r--arch/ia64/include/asm/kprobes.h (renamed from include/asm-ia64/kprobes.h)1
-rw-r--r--arch/ia64/include/asm/kregs.h (renamed from include/asm-ia64/kregs.h)0
-rw-r--r--arch/ia64/include/asm/kvm.h (renamed from include/asm-ia64/kvm.h)2
-rw-r--r--arch/ia64/include/asm/kvm_host.h (renamed from include/asm-ia64/kvm_host.h)0
-rw-r--r--arch/ia64/include/asm/kvm_para.h (renamed from include/asm-ia64/kvm_para.h)2
-rw-r--r--arch/ia64/include/asm/libata-portmap.h (renamed from include/asm-ia64/libata-portmap.h)0
-rw-r--r--arch/ia64/include/asm/linkage.h (renamed from include/asm-ia64/linkage.h)0
-rw-r--r--arch/ia64/include/asm/local.h (renamed from include/asm-ia64/local.h)0
-rw-r--r--arch/ia64/include/asm/machvec.h (renamed from include/asm-ia64/machvec.h)2
-rw-r--r--arch/ia64/include/asm/machvec_dig.h (renamed from include/asm-ia64/machvec_dig.h)0
-rw-r--r--arch/ia64/include/asm/machvec_hpsim.h (renamed from include/asm-ia64/machvec_hpsim.h)0
-rw-r--r--arch/ia64/include/asm/machvec_hpzx1.h (renamed from include/asm-ia64/machvec_hpzx1.h)0
-rw-r--r--arch/ia64/include/asm/machvec_hpzx1_swiotlb.h (renamed from include/asm-ia64/machvec_hpzx1_swiotlb.h)0
-rw-r--r--arch/ia64/include/asm/machvec_init.h (renamed from include/asm-ia64/machvec_init.h)0
-rw-r--r--arch/ia64/include/asm/machvec_sn2.h (renamed from include/asm-ia64/machvec_sn2.h)0
-rw-r--r--arch/ia64/include/asm/machvec_uv.h (renamed from include/asm-ia64/machvec_uv.h)0
-rw-r--r--arch/ia64/include/asm/mc146818rtc.h (renamed from include/asm-ia64/mc146818rtc.h)0
-rw-r--r--arch/ia64/include/asm/mca.h (renamed from include/asm-ia64/mca.h)0
-rw-r--r--arch/ia64/include/asm/mca_asm.h (renamed from include/asm-ia64/mca_asm.h)0
-rw-r--r--arch/ia64/include/asm/meminit.h (renamed from include/asm-ia64/meminit.h)0
-rw-r--r--arch/ia64/include/asm/mman.h (renamed from include/asm-ia64/mman.h)0
-rw-r--r--arch/ia64/include/asm/mmu.h (renamed from include/asm-ia64/mmu.h)0
-rw-r--r--arch/ia64/include/asm/mmu_context.h (renamed from include/asm-ia64/mmu_context.h)0
-rw-r--r--arch/ia64/include/asm/mmzone.h (renamed from include/asm-ia64/mmzone.h)0
-rw-r--r--arch/ia64/include/asm/module.h (renamed from include/asm-ia64/module.h)0
-rw-r--r--arch/ia64/include/asm/msgbuf.h (renamed from include/asm-ia64/msgbuf.h)0
-rw-r--r--arch/ia64/include/asm/mutex.h (renamed from include/asm-ia64/mutex.h)0
-rw-r--r--arch/ia64/include/asm/native/inst.h (renamed from include/asm-ia64/native/inst.h)2
-rw-r--r--arch/ia64/include/asm/native/irq.h (renamed from include/asm-ia64/native/irq.h)4
-rw-r--r--arch/ia64/include/asm/nodedata.h (renamed from include/asm-ia64/nodedata.h)0
-rw-r--r--arch/ia64/include/asm/numa.h (renamed from include/asm-ia64/numa.h)0
-rw-r--r--arch/ia64/include/asm/page.h (renamed from include/asm-ia64/page.h)0
-rw-r--r--arch/ia64/include/asm/pal.h (renamed from include/asm-ia64/pal.h)0
-rw-r--r--arch/ia64/include/asm/param.h (renamed from include/asm-ia64/param.h)0
-rw-r--r--arch/ia64/include/asm/paravirt.h (renamed from include/asm-ia64/paravirt.h)2
-rw-r--r--arch/ia64/include/asm/paravirt_privop.h (renamed from include/asm-ia64/paravirt_privop.h)2
-rw-r--r--arch/ia64/include/asm/parport.h (renamed from include/asm-ia64/parport.h)0
-rw-r--r--arch/ia64/include/asm/patch.h (renamed from include/asm-ia64/patch.h)0
-rw-r--r--arch/ia64/include/asm/pci.h (renamed from include/asm-ia64/pci.h)0
-rw-r--r--arch/ia64/include/asm/percpu.h (renamed from include/asm-ia64/percpu.h)0
-rw-r--r--arch/ia64/include/asm/perfmon.h (renamed from include/asm-ia64/perfmon.h)0
-rw-r--r--arch/ia64/include/asm/perfmon_default_smpl.h (renamed from include/asm-ia64/perfmon_default_smpl.h)0
-rw-r--r--arch/ia64/include/asm/pgalloc.h (renamed from include/asm-ia64/pgalloc.h)0
-rw-r--r--arch/ia64/include/asm/pgtable.h (renamed from include/asm-ia64/pgtable.h)0
-rw-r--r--arch/ia64/include/asm/poll.h (renamed from include/asm-ia64/poll.h)0
-rw-r--r--arch/ia64/include/asm/posix_types.h (renamed from include/asm-ia64/posix_types.h)0
-rw-r--r--arch/ia64/include/asm/processor.h (renamed from include/asm-ia64/processor.h)0
-rw-r--r--arch/ia64/include/asm/ptrace.h (renamed from include/asm-ia64/ptrace.h)0
-rw-r--r--arch/ia64/include/asm/ptrace_offsets.h (renamed from include/asm-ia64/ptrace_offsets.h)0
-rw-r--r--arch/ia64/include/asm/resource.h (renamed from include/asm-ia64/resource.h)0
-rw-r--r--arch/ia64/include/asm/rse.h (renamed from include/asm-ia64/rse.h)0
-rw-r--r--arch/ia64/include/asm/rwsem.h (renamed from include/asm-ia64/rwsem.h)2
-rw-r--r--arch/ia64/include/asm/sal.h (renamed from include/asm-ia64/sal.h)0
-rw-r--r--arch/ia64/include/asm/scatterlist.h (renamed from include/asm-ia64/scatterlist.h)0
-rw-r--r--arch/ia64/include/asm/sections.h (renamed from include/asm-ia64/sections.h)0
-rw-r--r--arch/ia64/include/asm/segment.h (renamed from include/asm-ia64/segment.h)0
-rw-r--r--arch/ia64/include/asm/sembuf.h (renamed from include/asm-ia64/sembuf.h)0
-rw-r--r--arch/ia64/include/asm/serial.h (renamed from include/asm-ia64/serial.h)2
-rw-r--r--arch/ia64/include/asm/setup.h (renamed from include/asm-ia64/setup.h)0
-rw-r--r--arch/ia64/include/asm/shmbuf.h (renamed from include/asm-ia64/shmbuf.h)0
-rw-r--r--arch/ia64/include/asm/shmparam.h (renamed from include/asm-ia64/shmparam.h)0
-rw-r--r--arch/ia64/include/asm/sigcontext.h (renamed from include/asm-ia64/sigcontext.h)0
-rw-r--r--arch/ia64/include/asm/siginfo.h (renamed from include/asm-ia64/siginfo.h)0
-rw-r--r--arch/ia64/include/asm/signal.h (renamed from include/asm-ia64/signal.h)0
-rw-r--r--arch/ia64/include/asm/smp.h (renamed from include/asm-ia64/smp.h)0
-rw-r--r--arch/ia64/include/asm/sn/acpi.h (renamed from include/asm-ia64/sn/acpi.h)0
-rw-r--r--arch/ia64/include/asm/sn/addrs.h (renamed from include/asm-ia64/sn/addrs.h)0
-rw-r--r--arch/ia64/include/asm/sn/arch.h (renamed from include/asm-ia64/sn/arch.h)0
-rw-r--r--arch/ia64/include/asm/sn/bte.h (renamed from include/asm-ia64/sn/bte.h)0
-rw-r--r--arch/ia64/include/asm/sn/clksupport.h (renamed from include/asm-ia64/sn/clksupport.h)0
-rw-r--r--arch/ia64/include/asm/sn/geo.h (renamed from include/asm-ia64/sn/geo.h)0
-rw-r--r--arch/ia64/include/asm/sn/intr.h (renamed from include/asm-ia64/sn/intr.h)0
-rw-r--r--arch/ia64/include/asm/sn/io.h (renamed from include/asm-ia64/sn/io.h)0
-rw-r--r--arch/ia64/include/asm/sn/ioc3.h (renamed from include/asm-ia64/sn/ioc3.h)0
-rw-r--r--arch/ia64/include/asm/sn/klconfig.h (renamed from include/asm-ia64/sn/klconfig.h)0
-rw-r--r--arch/ia64/include/asm/sn/l1.h (renamed from include/asm-ia64/sn/l1.h)0
-rw-r--r--arch/ia64/include/asm/sn/leds.h (renamed from include/asm-ia64/sn/leds.h)0
-rw-r--r--arch/ia64/include/asm/sn/module.h (renamed from include/asm-ia64/sn/module.h)0
-rw-r--r--arch/ia64/include/asm/sn/mspec.h (renamed from include/asm-ia64/sn/mspec.h)0
-rw-r--r--arch/ia64/include/asm/sn/nodepda.h (renamed from include/asm-ia64/sn/nodepda.h)0
-rw-r--r--arch/ia64/include/asm/sn/pcibr_provider.h (renamed from include/asm-ia64/sn/pcibr_provider.h)0
-rw-r--r--arch/ia64/include/asm/sn/pcibus_provider_defs.h (renamed from include/asm-ia64/sn/pcibus_provider_defs.h)0
-rw-r--r--arch/ia64/include/asm/sn/pcidev.h (renamed from include/asm-ia64/sn/pcidev.h)0
-rw-r--r--arch/ia64/include/asm/sn/pda.h (renamed from include/asm-ia64/sn/pda.h)0
-rw-r--r--arch/ia64/include/asm/sn/pic.h (renamed from include/asm-ia64/sn/pic.h)0
-rw-r--r--arch/ia64/include/asm/sn/rw_mmr.h (renamed from include/asm-ia64/sn/rw_mmr.h)0
-rw-r--r--arch/ia64/include/asm/sn/shub_mmr.h (renamed from include/asm-ia64/sn/shub_mmr.h)0
-rw-r--r--arch/ia64/include/asm/sn/shubio.h (renamed from include/asm-ia64/sn/shubio.h)0
-rw-r--r--arch/ia64/include/asm/sn/simulator.h (renamed from include/asm-ia64/sn/simulator.h)0
-rw-r--r--arch/ia64/include/asm/sn/sn2/sn_hwperf.h (renamed from include/asm-ia64/sn/sn2/sn_hwperf.h)0
-rw-r--r--arch/ia64/include/asm/sn/sn_cpuid.h (renamed from include/asm-ia64/sn/sn_cpuid.h)0
-rw-r--r--arch/ia64/include/asm/sn/sn_feature_sets.h (renamed from include/asm-ia64/sn/sn_feature_sets.h)0
-rw-r--r--arch/ia64/include/asm/sn/sn_sal.h (renamed from include/asm-ia64/sn/sn_sal.h)2
-rw-r--r--arch/ia64/include/asm/sn/tioca.h (renamed from include/asm-ia64/sn/tioca.h)0
-rw-r--r--arch/ia64/include/asm/sn/tioca_provider.h (renamed from include/asm-ia64/sn/tioca_provider.h)0
-rw-r--r--arch/ia64/include/asm/sn/tioce.h (renamed from include/asm-ia64/sn/tioce.h)0
-rw-r--r--arch/ia64/include/asm/sn/tioce_provider.h (renamed from include/asm-ia64/sn/tioce_provider.h)0
-rw-r--r--arch/ia64/include/asm/sn/tiocp.h (renamed from include/asm-ia64/sn/tiocp.h)0
-rw-r--r--arch/ia64/include/asm/sn/tiocx.h (renamed from include/asm-ia64/sn/tiocx.h)0
-rw-r--r--arch/ia64/include/asm/sn/types.h (renamed from include/asm-ia64/sn/types.h)0
-rw-r--r--arch/ia64/include/asm/socket.h (renamed from include/asm-ia64/socket.h)0
-rw-r--r--arch/ia64/include/asm/sockios.h (renamed from include/asm-ia64/sockios.h)0
-rw-r--r--arch/ia64/include/asm/sparsemem.h (renamed from include/asm-ia64/sparsemem.h)0
-rw-r--r--arch/ia64/include/asm/spinlock.h (renamed from include/asm-ia64/spinlock.h)0
-rw-r--r--arch/ia64/include/asm/spinlock_types.h (renamed from include/asm-ia64/spinlock_types.h)0
-rw-r--r--arch/ia64/include/asm/stat.h (renamed from include/asm-ia64/stat.h)0
-rw-r--r--arch/ia64/include/asm/statfs.h (renamed from include/asm-ia64/statfs.h)0
-rw-r--r--arch/ia64/include/asm/string.h (renamed from include/asm-ia64/string.h)0
-rw-r--r--arch/ia64/include/asm/suspend.h (renamed from include/asm-ia64/suspend.h)0
-rw-r--r--arch/ia64/include/asm/system.h (renamed from include/asm-ia64/system.h)0
-rw-r--r--arch/ia64/include/asm/termbits.h (renamed from include/asm-ia64/termbits.h)0
-rw-r--r--arch/ia64/include/asm/termios.h (renamed from include/asm-ia64/termios.h)0
-rw-r--r--arch/ia64/include/asm/thread_info.h (renamed from include/asm-ia64/thread_info.h)0
-rw-r--r--arch/ia64/include/asm/timex.h (renamed from include/asm-ia64/timex.h)0
-rw-r--r--arch/ia64/include/asm/tlb.h (renamed from include/asm-ia64/tlb.h)0
-rw-r--r--arch/ia64/include/asm/tlbflush.h (renamed from include/asm-ia64/tlbflush.h)0
-rw-r--r--arch/ia64/include/asm/topology.h (renamed from include/asm-ia64/topology.h)2
-rw-r--r--arch/ia64/include/asm/types.h (renamed from include/asm-ia64/types.h)0
-rw-r--r--arch/ia64/include/asm/uaccess.h (renamed from include/asm-ia64/uaccess.h)0
-rw-r--r--arch/ia64/include/asm/ucontext.h (renamed from include/asm-ia64/ucontext.h)0
-rw-r--r--arch/ia64/include/asm/unaligned.h (renamed from include/asm-ia64/unaligned.h)0
-rw-r--r--arch/ia64/include/asm/uncached.h (renamed from include/asm-ia64/uncached.h)0
-rw-r--r--arch/ia64/include/asm/unistd.h (renamed from include/asm-ia64/unistd.h)0
-rw-r--r--arch/ia64/include/asm/unwind.h (renamed from include/asm-ia64/unwind.h)0
-rw-r--r--arch/ia64/include/asm/user.h (renamed from include/asm-ia64/user.h)0
-rw-r--r--arch/ia64/include/asm/ustack.h (renamed from include/asm-ia64/ustack.h)0
-rw-r--r--arch/ia64/include/asm/uv/uv_hub.h (renamed from include/asm-ia64/uv/uv_hub.h)0
-rw-r--r--arch/ia64/include/asm/uv/uv_mmrs.h (renamed from include/asm-ia64/uv/uv_mmrs.h)0
-rw-r--r--arch/ia64/include/asm/vga.h (renamed from include/asm-ia64/vga.h)0
-rw-r--r--arch/ia64/include/asm/xor.h (renamed from include/asm-ia64/xor.h)2
-rw-r--r--arch/ia64/kernel/asm-offsets.c10
-rw-r--r--arch/ia64/kernel/head.S2
-rw-r--r--arch/ia64/kernel/iosapic.c2
-rw-r--r--arch/ia64/kernel/jprobes.S2
-rw-r--r--arch/ia64/kernel/nr-irqs.c2
-rw-r--r--arch/ia64/kernel/setup.c2
-rw-r--r--arch/ia64/sn/kernel/iomv.c2
192 files changed, 18 insertions, 38 deletions
diff --git a/include/asm-ia64/Kbuild b/arch/ia64/include/asm/Kbuild
index ccbe8ae47a6..ccbe8ae47a6 100644
--- a/include/asm-ia64/Kbuild
+++ b/arch/ia64/include/asm/Kbuild
diff --git a/include/asm-ia64/a.out.h b/arch/ia64/include/asm/a.out.h
index 193dcfb6759..193dcfb6759 100644
--- a/include/asm-ia64/a.out.h
+++ b/arch/ia64/include/asm/a.out.h
diff --git a/include/asm-ia64/acpi-ext.h b/arch/ia64/include/asm/acpi-ext.h
index 734d137dda6..734d137dda6 100644
--- a/include/asm-ia64/acpi-ext.h
+++ b/arch/ia64/include/asm/acpi-ext.h
diff --git a/include/asm-ia64/acpi.h b/arch/ia64/include/asm/acpi.h
index fcfad326f4c..0f82cc2934e 100644
--- a/include/asm-ia64/acpi.h
+++ b/arch/ia64/include/asm/acpi.h
@@ -1,6 +1,4 @@
/*
- * asm-ia64/acpi.h
- *
* Copyright (C) 1999 VA Linux Systems
* Copyright (C) 1999 Walt Drummond <drummond@valinux.com>
* Copyright (C) 2000,2001 J.I. Lee <jung-ik.lee@intel.com>
diff --git a/include/asm-ia64/agp.h b/arch/ia64/include/asm/agp.h
index c11fdd8ab4d..c11fdd8ab4d 100644
--- a/include/asm-ia64/agp.h
+++ b/arch/ia64/include/asm/agp.h
diff --git a/include/asm-ia64/asmmacro.h b/arch/ia64/include/asm/asmmacro.h
index c1642fd6402..c1642fd6402 100644
--- a/include/asm-ia64/asmmacro.h
+++ b/arch/ia64/include/asm/asmmacro.h
diff --git a/include/asm-ia64/atomic.h b/arch/ia64/include/asm/atomic.h
index 50c2b83fd5a..50c2b83fd5a 100644
--- a/include/asm-ia64/atomic.h
+++ b/arch/ia64/include/asm/atomic.h
diff --git a/include/asm-ia64/auxvec.h b/arch/ia64/include/asm/auxvec.h
index 23cebe5685b..23cebe5685b 100644
--- a/include/asm-ia64/auxvec.h
+++ b/arch/ia64/include/asm/auxvec.h
diff --git a/include/asm-ia64/bitops.h b/arch/ia64/include/asm/bitops.h
index e2ca8003733..e2ca8003733 100644
--- a/include/asm-ia64/bitops.h
+++ b/arch/ia64/include/asm/bitops.h
diff --git a/include/asm-ia64/break.h b/arch/ia64/include/asm/break.h
index f0340203989..f0340203989 100644
--- a/include/asm-ia64/break.h
+++ b/arch/ia64/include/asm/break.h
diff --git a/include/asm-ia64/bug.h b/arch/ia64/include/asm/bug.h
index 823616b5020..823616b5020 100644
--- a/include/asm-ia64/bug.h
+++ b/arch/ia64/include/asm/bug.h
diff --git a/include/asm-ia64/bugs.h b/arch/ia64/include/asm/bugs.h
index 433523e3b2e..433523e3b2e 100644
--- a/include/asm-ia64/bugs.h
+++ b/arch/ia64/include/asm/bugs.h
diff --git a/include/asm-ia64/byteorder.h b/arch/ia64/include/asm/byteorder.h
index 69bd41d7c26..69bd41d7c26 100644
--- a/include/asm-ia64/byteorder.h
+++ b/arch/ia64/include/asm/byteorder.h
diff --git a/include/asm-ia64/cache.h b/arch/ia64/include/asm/cache.h
index e7482bd628f..e7482bd628f 100644
--- a/include/asm-ia64/cache.h
+++ b/arch/ia64/include/asm/cache.h
diff --git a/include/asm-ia64/cacheflush.h b/arch/ia64/include/asm/cacheflush.h
index afcfbda76e2..afcfbda76e2 100644
--- a/include/asm-ia64/cacheflush.h
+++ b/arch/ia64/include/asm/cacheflush.h
diff --git a/include/asm-ia64/checksum.h b/arch/ia64/include/asm/checksum.h
index 97af155057e..97af155057e 100644
--- a/include/asm-ia64/checksum.h
+++ b/arch/ia64/include/asm/checksum.h
diff --git a/include/asm-ia64/compat.h b/arch/ia64/include/asm/compat.h
index dfcf75b8426..dfcf75b8426 100644
--- a/include/asm-ia64/compat.h
+++ b/arch/ia64/include/asm/compat.h
diff --git a/include/asm-ia64/cpu.h b/arch/ia64/include/asm/cpu.h
index fcca30b9f11..fcca30b9f11 100644
--- a/include/asm-ia64/cpu.h
+++ b/arch/ia64/include/asm/cpu.h
diff --git a/include/asm-ia64/cputime.h b/arch/ia64/include/asm/cputime.h
index f9abdec6577..d20b998cb91 100644
--- a/include/asm-ia64/cputime.h
+++ b/arch/ia64/include/asm/cputime.h
@@ -1,6 +1,5 @@
/*
- * include/asm-ia64/cputime.h:
- * Definitions for measuring cputime on ia64 machines.
+ * Definitions for measuring cputime on ia64 machines.
*
* Based on <asm-powerpc/cputime.h>.
*
diff --git a/include/asm-ia64/current.h b/arch/ia64/include/asm/current.h
index c659f90fbfd..c659f90fbfd 100644
--- a/include/asm-ia64/current.h
+++ b/arch/ia64/include/asm/current.h
diff --git a/include/asm-ia64/cyclone.h b/arch/ia64/include/asm/cyclone.h
index 88f6500e84a..88f6500e84a 100644
--- a/include/asm-ia64/cyclone.h
+++ b/arch/ia64/include/asm/cyclone.h
diff --git a/include/asm-ia64/delay.h b/arch/ia64/include/asm/delay.h
index a30a62f235e..a30a62f235e 100644
--- a/include/asm-ia64/delay.h
+++ b/arch/ia64/include/asm/delay.h
diff --git a/include/asm-ia64/device.h b/arch/ia64/include/asm/device.h
index 3db6daf7f25..3db6daf7f25 100644
--- a/include/asm-ia64/device.h
+++ b/arch/ia64/include/asm/device.h
diff --git a/include/asm-ia64/div64.h b/arch/ia64/include/asm/div64.h
index 6cd978cefb2..6cd978cefb2 100644
--- a/include/asm-ia64/div64.h
+++ b/arch/ia64/include/asm/div64.h
diff --git a/include/asm-ia64/dma-mapping.h b/arch/ia64/include/asm/dma-mapping.h
index 9f0df9bd46b..9f0df9bd46b 100644
--- a/include/asm-ia64/dma-mapping.h
+++ b/arch/ia64/include/asm/dma-mapping.h
diff --git a/include/asm-ia64/dma.h b/arch/ia64/include/asm/dma.h
index 4d97f60f1ef..4d97f60f1ef 100644
--- a/include/asm-ia64/dma.h
+++ b/arch/ia64/include/asm/dma.h
diff --git a/include/asm-ia64/dmi.h b/arch/ia64/include/asm/dmi.h
index 00eb1b130b6..00eb1b130b6 100644
--- a/include/asm-ia64/dmi.h
+++ b/arch/ia64/include/asm/dmi.h
diff --git a/include/asm-ia64/elf.h b/arch/ia64/include/asm/elf.h
index 5e0c1a6bce8..5e0c1a6bce8 100644
--- a/include/asm-ia64/elf.h
+++ b/arch/ia64/include/asm/elf.h
diff --git a/include/asm-ia64/emergency-restart.h b/arch/ia64/include/asm/emergency-restart.h
index 108d8c48e42..108d8c48e42 100644
--- a/include/asm-ia64/emergency-restart.h
+++ b/arch/ia64/include/asm/emergency-restart.h
diff --git a/include/asm-ia64/errno.h b/arch/ia64/include/asm/errno.h
index 4c82b503d92..4c82b503d92 100644
--- a/include/asm-ia64/errno.h
+++ b/arch/ia64/include/asm/errno.h
diff --git a/include/asm-ia64/esi.h b/arch/ia64/include/asm/esi.h
index 40991c6ba64..40991c6ba64 100644
--- a/include/asm-ia64/esi.h
+++ b/arch/ia64/include/asm/esi.h
diff --git a/include/asm-ia64/fb.h b/arch/ia64/include/asm/fb.h
index 89a397cee90..89a397cee90 100644
--- a/include/asm-ia64/fb.h
+++ b/arch/ia64/include/asm/fb.h
diff --git a/include/asm-ia64/fcntl.h b/arch/ia64/include/asm/fcntl.h
index 1dd275dc8f6..1dd275dc8f6 100644
--- a/include/asm-ia64/fcntl.h
+++ b/arch/ia64/include/asm/fcntl.h
diff --git a/include/asm-ia64/fpswa.h b/arch/ia64/include/asm/fpswa.h
index 62edfceadaa..62edfceadaa 100644
--- a/include/asm-ia64/fpswa.h
+++ b/arch/ia64/include/asm/fpswa.h
diff --git a/include/asm-ia64/fpu.h b/arch/ia64/include/asm/fpu.h
index 3859558ff0a..3859558ff0a 100644
--- a/include/asm-ia64/fpu.h
+++ b/arch/ia64/include/asm/fpu.h
diff --git a/include/asm-ia64/futex.h b/arch/ia64/include/asm/futex.h
index c7f0f062239..c7f0f062239 100644
--- a/include/asm-ia64/futex.h
+++ b/arch/ia64/include/asm/futex.h
diff --git a/include/asm-ia64/gcc_intrin.h b/arch/ia64/include/asm/gcc_intrin.h
index 0f5b5592175..0f5b5592175 100644
--- a/include/asm-ia64/gcc_intrin.h
+++ b/arch/ia64/include/asm/gcc_intrin.h
diff --git a/include/asm-ia64/hardirq.h b/arch/ia64/include/asm/hardirq.h
index 140e495b8e0..140e495b8e0 100644
--- a/include/asm-ia64/hardirq.h
+++ b/arch/ia64/include/asm/hardirq.h
diff --git a/include/asm-ia64/hpsim.h b/arch/ia64/include/asm/hpsim.h
index 892ab198a9d..892ab198a9d 100644
--- a/include/asm-ia64/hpsim.h
+++ b/arch/ia64/include/asm/hpsim.h
diff --git a/include/asm-ia64/hugetlb.h b/arch/ia64/include/asm/hugetlb.h
index da55c63728e..da55c63728e 100644
--- a/include/asm-ia64/hugetlb.h
+++ b/arch/ia64/include/asm/hugetlb.h
diff --git a/include/asm-ia64/hw_irq.h b/arch/ia64/include/asm/hw_irq.h
index 5c99cbcb8a0..5c99cbcb8a0 100644
--- a/include/asm-ia64/hw_irq.h
+++ b/arch/ia64/include/asm/hw_irq.h
diff --git a/include/asm-ia64/ia32.h b/arch/ia64/include/asm/ia32.h
index 2390ee145aa..2390ee145aa 100644
--- a/include/asm-ia64/ia32.h
+++ b/arch/ia64/include/asm/ia32.h
diff --git a/include/asm-ia64/ia64regs.h b/arch/ia64/include/asm/ia64regs.h
index 1757f1c11ad..1757f1c11ad 100644
--- a/include/asm-ia64/ia64regs.h
+++ b/arch/ia64/include/asm/ia64regs.h
diff --git a/include/asm-ia64/intel_intrin.h b/arch/ia64/include/asm/intel_intrin.h
index 53cec577558..53cec577558 100644
--- a/include/asm-ia64/intel_intrin.h
+++ b/arch/ia64/include/asm/intel_intrin.h
diff --git a/include/asm-ia64/intrinsics.h b/arch/ia64/include/asm/intrinsics.h
index 47d686dba1e..47d686dba1e 100644
--- a/include/asm-ia64/intrinsics.h
+++ b/arch/ia64/include/asm/intrinsics.h
diff --git a/include/asm-ia64/io.h b/arch/ia64/include/asm/io.h
index 260a85ac9d6..260a85ac9d6 100644
--- a/include/asm-ia64/io.h
+++ b/arch/ia64/include/asm/io.h
diff --git a/include/asm-ia64/ioctl.h b/arch/ia64/include/asm/ioctl.h
index b279fe06dfe..b279fe06dfe 100644
--- a/include/asm-ia64/ioctl.h
+++ b/arch/ia64/include/asm/ioctl.h
diff --git a/include/asm-ia64/ioctls.h b/arch/ia64/include/asm/ioctls.h
index f41b636a0bf..f41b636a0bf 100644
--- a/include/asm-ia64/ioctls.h
+++ b/arch/ia64/include/asm/ioctls.h
diff --git a/include/asm-ia64/iosapic.h b/arch/ia64/include/asm/iosapic.h
index b9c102e15f2..b9c102e15f2 100644
--- a/include/asm-ia64/iosapic.h
+++ b/arch/ia64/include/asm/iosapic.h
diff --git a/include/asm-ia64/ipcbuf.h b/arch/ia64/include/asm/ipcbuf.h
index 079899ae7d3..079899ae7d3 100644
--- a/include/asm-ia64/ipcbuf.h
+++ b/arch/ia64/include/asm/ipcbuf.h
diff --git a/include/asm-ia64/irq.h b/arch/ia64/include/asm/irq.h
index 3627116fb0e..3627116fb0e 100644
--- a/include/asm-ia64/irq.h
+++ b/arch/ia64/include/asm/irq.h
diff --git a/include/asm-ia64/irq_regs.h b/arch/ia64/include/asm/irq_regs.h
index 3dd9c0b7027..3dd9c0b7027 100644
--- a/include/asm-ia64/irq_regs.h
+++ b/arch/ia64/include/asm/irq_regs.h
diff --git a/include/asm-ia64/kdebug.h b/arch/ia64/include/asm/kdebug.h
index 35e49407d06..d11a6985503 100644
--- a/include/asm-ia64/kdebug.h
+++ b/arch/ia64/include/asm/kdebug.h
@@ -1,8 +1,6 @@
#ifndef _IA64_KDEBUG_H
#define _IA64_KDEBUG_H 1
/*
- * include/asm-ia64/kdebug.h
- *
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation; either version 2 of the License, or
diff --git a/include/asm-ia64/kexec.h b/arch/ia64/include/asm/kexec.h
index 541be835fc5..541be835fc5 100644
--- a/include/asm-ia64/kexec.h
+++ b/arch/ia64/include/asm/kexec.h
diff --git a/include/asm-ia64/kmap_types.h b/arch/ia64/include/asm/kmap_types.h
index 5d1658aa2b3..5d1658aa2b3 100644
--- a/include/asm-ia64/kmap_types.h
+++ b/arch/ia64/include/asm/kmap_types.h
diff --git a/include/asm-ia64/kprobes.h b/arch/ia64/include/asm/kprobes.h
index ef71b57fc2f..dbf83fb28db 100644
--- a/include/asm-ia64/kprobes.h
+++ b/arch/ia64/include/asm/kprobes.h
@@ -2,7 +2,6 @@
#define _ASM_KPROBES_H
/*
* Kernel Probes (KProbes)
- * include/asm-ia64/kprobes.h
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
diff --git a/include/asm-ia64/kregs.h b/arch/ia64/include/asm/kregs.h
index aefcdfee7f2..aefcdfee7f2 100644
--- a/include/asm-ia64/kregs.h
+++ b/arch/ia64/include/asm/kregs.h
diff --git a/include/asm-ia64/kvm.h b/arch/ia64/include/asm/kvm.h
index 3f6a090cbd9..f38472ac226 100644
--- a/include/asm-ia64/kvm.h
+++ b/arch/ia64/include/asm/kvm.h
@@ -2,7 +2,7 @@
#define __ASM_IA64_KVM_H
/*
- * asm-ia64/kvm.h: kvm structure definitions for ia64
+ * kvm structure definitions for ia64
*
* Copyright (C) 2007 Xiantao Zhang <xiantao.zhang@intel.com>
*
diff --git a/include/asm-ia64/kvm_host.h b/arch/ia64/include/asm/kvm_host.h
index 1efe513a994..1efe513a994 100644
--- a/include/asm-ia64/kvm_host.h
+++ b/arch/ia64/include/asm/kvm_host.h
diff --git a/include/asm-ia64/kvm_para.h b/arch/ia64/include/asm/kvm_para.h
index 9f9796bb344..0d6d8ca07b8 100644
--- a/include/asm-ia64/kvm_para.h
+++ b/arch/ia64/include/asm/kvm_para.h
@@ -2,8 +2,6 @@
#define __IA64_KVM_PARA_H
/*
- * asm-ia64/kvm_para.h
- *
* Copyright (C) 2007 Xiantao Zhang <xiantao.zhang@intel.com>
*
* This program is free software; you can redistribute it and/or modify it
diff --git a/include/asm-ia64/libata-portmap.h b/arch/ia64/include/asm/libata-portmap.h
index 0e00c9a9f41..0e00c9a9f41 100644
--- a/include/asm-ia64/libata-portmap.h
+++ b/arch/ia64/include/asm/libata-portmap.h
diff --git a/include/asm-ia64/linkage.h b/arch/ia64/include/asm/linkage.h
index ef22a45c189..ef22a45c189 100644
--- a/include/asm-ia64/linkage.h
+++ b/arch/ia64/include/asm/linkage.h
diff --git a/include/asm-ia64/local.h b/arch/ia64/include/asm/local.h
index c11c530f74d..c11c530f74d 100644
--- a/include/asm-ia64/local.h
+++ b/arch/ia64/include/asm/local.h
diff --git a/include/asm-ia64/machvec.h b/arch/ia64/include/asm/machvec.h
index a6d50c77b6b..2b850ccafef 100644
--- a/include/asm-ia64/machvec.h
+++ b/arch/ia64/include/asm/machvec.h
@@ -290,7 +290,7 @@ extern void machvec_init (const char *name);
extern void machvec_init_from_cmdline(const char *cmdline);
# else
-# error Unknown configuration. Update asm-ia64/machvec.h.
+# error Unknown configuration. Update arch/ia64/include/asm/machvec.h.
# endif /* CONFIG_IA64_GENERIC */
/*
diff --git a/include/asm-ia64/machvec_dig.h b/arch/ia64/include/asm/machvec_dig.h
index 8a0752f4098..8a0752f4098 100644
--- a/include/asm-ia64/machvec_dig.h
+++ b/arch/ia64/include/asm/machvec_dig.h
diff --git a/include/asm-ia64/machvec_hpsim.h b/arch/ia64/include/asm/machvec_hpsim.h
index cf72fc87fdf..cf72fc87fdf 100644
--- a/include/asm-ia64/machvec_hpsim.h
+++ b/arch/ia64/include/asm/machvec_hpsim.h
diff --git a/include/asm-ia64/machvec_hpzx1.h b/arch/ia64/include/asm/machvec_hpzx1.h
index 2f57f5144b9..2f57f5144b9 100644
--- a/include/asm-ia64/machvec_hpzx1.h
+++ b/arch/ia64/include/asm/machvec_hpzx1.h
diff --git a/include/asm-ia64/machvec_hpzx1_swiotlb.h b/arch/ia64/include/asm/machvec_hpzx1_swiotlb.h
index a842cdda827..a842cdda827 100644
--- a/include/asm-ia64/machvec_hpzx1_swiotlb.h
+++ b/arch/ia64/include/asm/machvec_hpzx1_swiotlb.h
diff --git a/include/asm-ia64/machvec_init.h b/arch/ia64/include/asm/machvec_init.h
index 7f21249fba3..7f21249fba3 100644
--- a/include/asm-ia64/machvec_init.h
+++ b/arch/ia64/include/asm/machvec_init.h
diff --git a/include/asm-ia64/machvec_sn2.h b/arch/ia64/include/asm/machvec_sn2.h
index 781308ea7b8..781308ea7b8 100644
--- a/include/asm-ia64/machvec_sn2.h
+++ b/arch/ia64/include/asm/machvec_sn2.h
diff --git a/include/asm-ia64/machvec_uv.h b/arch/ia64/include/asm/machvec_uv.h
index 2931447f381..2931447f381 100644
--- a/include/asm-ia64/machvec_uv.h
+++ b/arch/ia64/include/asm/machvec_uv.h
diff --git a/include/asm-ia64/mc146818rtc.h b/arch/ia64/include/asm/mc146818rtc.h
index 407787a237b..407787a237b 100644
--- a/include/asm-ia64/mc146818rtc.h
+++ b/arch/ia64/include/asm/mc146818rtc.h
diff --git a/include/asm-ia64/mca.h b/arch/ia64/include/asm/mca.h
index 18a4321349a..18a4321349a 100644
--- a/include/asm-ia64/mca.h
+++ b/arch/ia64/include/asm/mca.h
diff --git a/include/asm-ia64/mca_asm.h b/arch/ia64/include/asm/mca_asm.h
index dd2a5b13439..dd2a5b13439 100644
--- a/include/asm-ia64/mca_asm.h
+++ b/arch/ia64/include/asm/mca_asm.h
diff --git a/include/asm-ia64/meminit.h b/arch/ia64/include/asm/meminit.h
index 7245a578159..7245a578159 100644
--- a/include/asm-ia64/meminit.h
+++ b/arch/ia64/include/asm/meminit.h
diff --git a/include/asm-ia64/mman.h b/arch/ia64/include/asm/mman.h
index c73b87832a1..c73b87832a1 100644
--- a/include/asm-ia64/mman.h
+++ b/arch/ia64/include/asm/mman.h
diff --git a/include/asm-ia64/mmu.h b/arch/ia64/include/asm/mmu.h
index 611432ba579..611432ba579 100644
--- a/include/asm-ia64/mmu.h
+++ b/arch/ia64/include/asm/mmu.h
diff --git a/include/asm-ia64/mmu_context.h b/arch/ia64/include/asm/mmu_context.h
index 040bc87db93..040bc87db93 100644
--- a/include/asm-ia64/mmu_context.h
+++ b/arch/ia64/include/asm/mmu_context.h
diff --git a/include/asm-ia64/mmzone.h b/arch/ia64/include/asm/mmzone.h
index 34efe88eb84..34efe88eb84 100644
--- a/include/asm-ia64/mmzone.h
+++ b/arch/ia64/include/asm/mmzone.h
diff --git a/include/asm-ia64/module.h b/arch/ia64/include/asm/module.h
index d2da61e4c49..d2da61e4c49 100644
--- a/include/asm-ia64/module.h
+++ b/arch/ia64/include/asm/module.h
diff --git a/include/asm-ia64/msgbuf.h b/arch/ia64/include/asm/msgbuf.h
index 6c64c0d2aae..6c64c0d2aae 100644
--- a/include/asm-ia64/msgbuf.h
+++ b/arch/ia64/include/asm/msgbuf.h
diff --git a/include/asm-ia64/mutex.h b/arch/ia64/include/asm/mutex.h
index bed73a643a5..bed73a643a5 100644
--- a/include/asm-ia64/mutex.h
+++ b/arch/ia64/include/asm/mutex.h
diff --git a/include/asm-ia64/native/inst.h b/arch/ia64/include/asm/native/inst.h
index c953a2ca4fc..c8efbf7b849 100644
--- a/include/asm-ia64/native/inst.h
+++ b/arch/ia64/include/asm/native/inst.h
@@ -1,5 +1,5 @@
/******************************************************************************
- * include/asm-ia64/native/inst.h
+ * arch/ia64/include/asm/native/inst.h
*
* Copyright (c) 2008 Isaku Yamahata <yamahata at valinux co jp>
* VA Linux Systems Japan K.K.
diff --git a/include/asm-ia64/native/irq.h b/arch/ia64/include/asm/native/irq.h
index efe9ff74a3c..887a228e2ed 100644
--- a/include/asm-ia64/native/irq.h
+++ b/arch/ia64/include/asm/native/irq.h
@@ -1,5 +1,5 @@
/******************************************************************************
- * include/asm-ia64/native/irq.h
+ * arch/ia64/include/asm/native/irq.h
*
* Copyright (c) 2008 Isaku Yamahata <yamahata at valinux co jp>
* VA Linux Systems Japan K.K.
@@ -17,8 +17,6 @@
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
- *
- * moved from linux/include/asm-ia64/irq.h.
*/
#ifndef _ASM_IA64_NATIVE_IRQ_H
diff --git a/include/asm-ia64/nodedata.h b/arch/ia64/include/asm/nodedata.h
index 2fb337b0e9b..2fb337b0e9b 100644
--- a/include/asm-ia64/nodedata.h
+++ b/arch/ia64/include/asm/nodedata.h
diff --git a/include/asm-ia64/numa.h b/arch/ia64/include/asm/numa.h
index 3499ff57bf4..3499ff57bf4 100644
--- a/include/asm-ia64/numa.h
+++ b/arch/ia64/include/asm/numa.h
diff --git a/include/asm-ia64/page.h b/arch/ia64/include/asm/page.h
index 5f271bc712e..5f271bc712e 100644
--- a/include/asm-ia64/page.h
+++ b/arch/ia64/include/asm/page.h
diff --git a/include/asm-ia64/pal.h b/arch/ia64/include/asm/pal.h
index 67b02901ead..67b02901ead 100644
--- a/include/asm-ia64/pal.h
+++ b/arch/ia64/include/asm/pal.h
diff --git a/include/asm-ia64/param.h b/arch/ia64/include/asm/param.h
index 0964c32c135..0964c32c135 100644
--- a/include/asm-ia64/param.h
+++ b/arch/ia64/include/asm/param.h
diff --git a/include/asm-ia64/paravirt.h b/arch/ia64/include/asm/paravirt.h
index 1b4df129f57..660cab04483 100644
--- a/include/asm-ia64/paravirt.h
+++ b/arch/ia64/include/asm/paravirt.h
@@ -1,6 +1,4 @@
/******************************************************************************
- * include/asm-ia64/paravirt.h
- *
* Copyright (c) 2008 Isaku Yamahata <yamahata at valinux co jp>
* VA Linux Systems Japan K.K.
*
diff --git a/include/asm-ia64/paravirt_privop.h b/arch/ia64/include/asm/paravirt_privop.h
index 52482e6940a..d577aac1183 100644
--- a/include/asm-ia64/paravirt_privop.h
+++ b/arch/ia64/include/asm/paravirt_privop.h
@@ -1,6 +1,4 @@
/******************************************************************************
- * include/asm-ia64/paravirt_privops.h
- *
* Copyright (c) 2008 Isaku Yamahata <yamahata at valinux co jp>
* VA Linux Systems Japan K.K.
*
diff --git a/include/asm-ia64/parport.h b/arch/ia64/include/asm/parport.h
index 67e16adfcd2..67e16adfcd2 100644
--- a/include/asm-ia64/parport.h
+++ b/arch/ia64/include/asm/parport.h
diff --git a/include/asm-ia64/patch.h b/arch/ia64/include/asm/patch.h
index 295fe6ab458..295fe6ab458 100644
--- a/include/asm-ia64/patch.h
+++ b/arch/ia64/include/asm/patch.h
diff --git a/include/asm-ia64/pci.h b/arch/ia64/include/asm/pci.h
index 0149097b736..0149097b736 100644
--- a/include/asm-ia64/pci.h
+++ b/arch/ia64/include/asm/pci.h
diff --git a/include/asm-ia64/percpu.h b/arch/ia64/include/asm/percpu.h
index 77f30b664b4..77f30b664b4 100644
--- a/include/asm-ia64/percpu.h
+++ b/arch/ia64/include/asm/percpu.h
diff --git a/include/asm-ia64/perfmon.h b/arch/ia64/include/asm/perfmon.h
index 7f3333dd00e..7f3333dd00e 100644
--- a/include/asm-ia64/perfmon.h
+++ b/arch/ia64/include/asm/perfmon.h
diff --git a/include/asm-ia64/perfmon_default_smpl.h b/arch/ia64/include/asm/perfmon_default_smpl.h
index 48822c0811d..48822c0811d 100644
--- a/include/asm-ia64/perfmon_default_smpl.h
+++ b/arch/ia64/include/asm/perfmon_default_smpl.h
diff --git a/include/asm-ia64/pgalloc.h b/arch/ia64/include/asm/pgalloc.h
index b9ac1a6fc21..b9ac1a6fc21 100644
--- a/include/asm-ia64/pgalloc.h
+++ b/arch/ia64/include/asm/pgalloc.h
diff --git a/include/asm-ia64/pgtable.h b/arch/ia64/include/asm/pgtable.h
index 7a9bff47564..7a9bff47564 100644
--- a/include/asm-ia64/pgtable.h
+++ b/arch/ia64/include/asm/pgtable.h
diff --git a/include/asm-ia64/poll.h b/arch/ia64/include/asm/poll.h
index c98509d3149..c98509d3149 100644
--- a/include/asm-ia64/poll.h
+++ b/arch/ia64/include/asm/poll.h
diff --git a/include/asm-ia64/posix_types.h b/arch/ia64/include/asm/posix_types.h
index 17885567b73..17885567b73 100644
--- a/include/asm-ia64/posix_types.h
+++ b/arch/ia64/include/asm/posix_types.h
diff --git a/include/asm-ia64/processor.h b/arch/ia64/include/asm/processor.h
index f88fa054d01..f88fa054d01 100644
--- a/include/asm-ia64/processor.h
+++ b/arch/ia64/include/asm/processor.h
diff --git a/include/asm-ia64/ptrace.h b/arch/ia64/include/asm/ptrace.h
index 15f8dcfe6ee..15f8dcfe6ee 100644
--- a/include/asm-ia64/ptrace.h
+++ b/arch/ia64/include/asm/ptrace.h
diff --git a/include/asm-ia64/ptrace_offsets.h b/arch/ia64/include/asm/ptrace_offsets.h
index b712773c759..b712773c759 100644
--- a/include/asm-ia64/ptrace_offsets.h
+++ b/arch/ia64/include/asm/ptrace_offsets.h
diff --git a/include/asm-ia64/resource.h b/arch/ia64/include/asm/resource.h
index ba2272a87fc..ba2272a87fc 100644
--- a/include/asm-ia64/resource.h
+++ b/arch/ia64/include/asm/resource.h
diff --git a/include/asm-ia64/rse.h b/arch/ia64/include/asm/rse.h
index 02830a3b019..02830a3b019 100644
--- a/include/asm-ia64/rse.h
+++ b/arch/ia64/include/asm/rse.h
diff --git a/include/asm-ia64/rwsem.h b/arch/ia64/include/asm/rwsem.h
index 8aba06a7b03..fbee74b1578 100644
--- a/include/asm-ia64/rwsem.h
+++ b/arch/ia64/include/asm/rwsem.h
@@ -1,5 +1,5 @@
/*
- * asm-ia64/rwsem.h: R/W semaphores for ia64
+ * R/W semaphores for ia64
*
* Copyright (C) 2003 Ken Chen <kenneth.w.chen@intel.com>
* Copyright (C) 2003 Asit Mallick <asit.k.mallick@intel.com>
diff --git a/include/asm-ia64/sal.h b/arch/ia64/include/asm/sal.h
index 89594b442f8..89594b442f8 100644
--- a/include/asm-ia64/sal.h
+++ b/arch/ia64/include/asm/sal.h
diff --git a/include/asm-ia64/scatterlist.h b/arch/ia64/include/asm/scatterlist.h
index d6f57874041..d6f57874041 100644
--- a/include/asm-ia64/scatterlist.h
+++ b/arch/ia64/include/asm/scatterlist.h
diff --git a/include/asm-ia64/sections.h b/arch/ia64/include/asm/sections.h
index 7286e4a9fe8..7286e4a9fe8 100644
--- a/include/asm-ia64/sections.h
+++ b/arch/ia64/include/asm/sections.h
diff --git a/include/asm-ia64/segment.h b/arch/ia64/include/asm/segment.h
index b89e2b3d648..b89e2b3d648 100644
--- a/include/asm-ia64/segment.h
+++ b/arch/ia64/include/asm/segment.h
diff --git a/include/asm-ia64/sembuf.h b/arch/ia64/include/asm/sembuf.h
index 1340fbc04d3..1340fbc04d3 100644
--- a/include/asm-ia64/sembuf.h
+++ b/arch/ia64/include/asm/sembuf.h
diff --git a/include/asm-ia64/serial.h b/arch/ia64/include/asm/serial.h
index 0c7a2f3dcf1..068be11583d 100644
--- a/include/asm-ia64/serial.h
+++ b/arch/ia64/include/asm/serial.h
@@ -1,6 +1,4 @@
/*
- * include/asm-ia64/serial.h
- *
* Derived from the i386 version.
*/
diff --git a/include/asm-ia64/setup.h b/arch/ia64/include/asm/setup.h
index 4399a44355b..4399a44355b 100644
--- a/include/asm-ia64/setup.h
+++ b/arch/ia64/include/asm/setup.h
diff --git a/include/asm-ia64/shmbuf.h b/arch/ia64/include/asm/shmbuf.h
index 585002a77ac..585002a77ac 100644
--- a/include/asm-ia64/shmbuf.h
+++ b/arch/ia64/include/asm/shmbuf.h
diff --git a/include/asm-ia64/shmparam.h b/arch/ia64/include/asm/shmparam.h
index d07508dc54a..d07508dc54a 100644
--- a/include/asm-ia64/shmparam.h
+++ b/arch/ia64/include/asm/shmparam.h
diff --git a/include/asm-ia64/sigcontext.h b/arch/ia64/include/asm/sigcontext.h
index 57ff777bcc4..57ff777bcc4 100644
--- a/include/asm-ia64/sigcontext.h
+++ b/arch/ia64/include/asm/sigcontext.h
diff --git a/include/asm-ia64/siginfo.h b/arch/ia64/include/asm/siginfo.h
index 9294e4b0c8b..9294e4b0c8b 100644
--- a/include/asm-ia64/siginfo.h
+++ b/arch/ia64/include/asm/siginfo.h
diff --git a/include/asm-ia64/signal.h b/arch/ia64/include/asm/signal.h
index 4f5ca5643cb..4f5ca5643cb 100644
--- a/include/asm-ia64/signal.h
+++ b/arch/ia64/include/asm/signal.h
diff --git a/include/asm-ia64/smp.h b/arch/ia64/include/asm/smp.h
index 12d96e0cd51..12d96e0cd51 100644
--- a/include/asm-ia64/smp.h
+++ b/arch/ia64/include/asm/smp.h
diff --git a/include/asm-ia64/sn/acpi.h b/arch/ia64/include/asm/sn/acpi.h
index 9ce2801cbd5..9ce2801cbd5 100644
--- a/include/asm-ia64/sn/acpi.h
+++ b/arch/ia64/include/asm/sn/acpi.h
diff --git a/include/asm-ia64/sn/addrs.h b/arch/ia64/include/asm/sn/addrs.h
index e715c794b18..e715c794b18 100644
--- a/include/asm-ia64/sn/addrs.h
+++ b/arch/ia64/include/asm/sn/addrs.h
diff --git a/include/asm-ia64/sn/arch.h b/arch/ia64/include/asm/sn/arch.h
index 7caa1f44cd9..7caa1f44cd9 100644
--- a/include/asm-ia64/sn/arch.h
+++ b/arch/ia64/include/asm/sn/arch.h
diff --git a/include/asm-ia64/sn/bte.h b/arch/ia64/include/asm/sn/bte.h
index a0d214f4311..a0d214f4311 100644
--- a/include/asm-ia64/sn/bte.h
+++ b/arch/ia64/include/asm/sn/bte.h
diff --git a/include/asm-ia64/sn/clksupport.h b/arch/ia64/include/asm/sn/clksupport.h
index d340c365a82..d340c365a82 100644
--- a/include/asm-ia64/sn/clksupport.h
+++ b/arch/ia64/include/asm/sn/clksupport.h
diff --git a/include/asm-ia64/sn/geo.h b/arch/ia64/include/asm/sn/geo.h
index f083c943406..f083c943406 100644
--- a/include/asm-ia64/sn/geo.h
+++ b/arch/ia64/include/asm/sn/geo.h
diff --git a/include/asm-ia64/sn/intr.h b/arch/ia64/include/asm/sn/intr.h
index e0487aa9741..e0487aa9741 100644
--- a/include/asm-ia64/sn/intr.h
+++ b/arch/ia64/include/asm/sn/intr.h
diff --git a/include/asm-ia64/sn/io.h b/arch/ia64/include/asm/sn/io.h
index 41c73a73562..41c73a73562 100644
--- a/include/asm-ia64/sn/io.h
+++ b/arch/ia64/include/asm/sn/io.h
diff --git a/include/asm-ia64/sn/ioc3.h b/arch/ia64/include/asm/sn/ioc3.h
index 95ed6cc83cf..95ed6cc83cf 100644
--- a/include/asm-ia64/sn/ioc3.h
+++ b/arch/ia64/include/asm/sn/ioc3.h
diff --git a/include/asm-ia64/sn/klconfig.h b/arch/ia64/include/asm/sn/klconfig.h
index bcbf209d63b..bcbf209d63b 100644
--- a/include/asm-ia64/sn/klconfig.h
+++ b/arch/ia64/include/asm/sn/klconfig.h
diff --git a/include/asm-ia64/sn/l1.h b/arch/ia64/include/asm/sn/l1.h
index 344bf44bb35..344bf44bb35 100644
--- a/include/asm-ia64/sn/l1.h
+++ b/arch/ia64/include/asm/sn/l1.h
diff --git a/include/asm-ia64/sn/leds.h b/arch/ia64/include/asm/sn/leds.h
index 66cf8c4d92c..66cf8c4d92c 100644
--- a/include/asm-ia64/sn/leds.h
+++ b/arch/ia64/include/asm/sn/leds.h
diff --git a/include/asm-ia64/sn/module.h b/arch/ia64/include/asm/sn/module.h
index 734e980ece2..734e980ece2 100644
--- a/include/asm-ia64/sn/module.h
+++ b/arch/ia64/include/asm/sn/module.h
diff --git a/include/asm-ia64/sn/mspec.h b/arch/ia64/include/asm/sn/mspec.h
index c1d3c50c322..c1d3c50c322 100644
--- a/include/asm-ia64/sn/mspec.h
+++ b/arch/ia64/include/asm/sn/mspec.h
diff --git a/include/asm-ia64/sn/nodepda.h b/arch/ia64/include/asm/sn/nodepda.h
index ee118b901de..ee118b901de 100644
--- a/include/asm-ia64/sn/nodepda.h
+++ b/arch/ia64/include/asm/sn/nodepda.h
diff --git a/include/asm-ia64/sn/pcibr_provider.h b/arch/ia64/include/asm/sn/pcibr_provider.h
index da205b7cdaa..da205b7cdaa 100644
--- a/include/asm-ia64/sn/pcibr_provider.h
+++ b/arch/ia64/include/asm/sn/pcibr_provider.h
diff --git a/include/asm-ia64/sn/pcibus_provider_defs.h b/arch/ia64/include/asm/sn/pcibus_provider_defs.h
index 8f7c83d0f6d..8f7c83d0f6d 100644
--- a/include/asm-ia64/sn/pcibus_provider_defs.h
+++ b/arch/ia64/include/asm/sn/pcibus_provider_defs.h
diff --git a/include/asm-ia64/sn/pcidev.h b/arch/ia64/include/asm/sn/pcidev.h
index 1c2382cea80..1c2382cea80 100644
--- a/include/asm-ia64/sn/pcidev.h
+++ b/arch/ia64/include/asm/sn/pcidev.h
diff --git a/include/asm-ia64/sn/pda.h b/arch/ia64/include/asm/sn/pda.h
index 1c5108d44d8..1c5108d44d8 100644
--- a/include/asm-ia64/sn/pda.h
+++ b/arch/ia64/include/asm/sn/pda.h
diff --git a/include/asm-ia64/sn/pic.h b/arch/ia64/include/asm/sn/pic.h
index 5f9da5fd6e5..5f9da5fd6e5 100644
--- a/include/asm-ia64/sn/pic.h
+++ b/arch/ia64/include/asm/sn/pic.h
diff --git a/include/asm-ia64/sn/rw_mmr.h b/arch/ia64/include/asm/sn/rw_mmr.h
index 2d78f4c5a45..2d78f4c5a45 100644
--- a/include/asm-ia64/sn/rw_mmr.h
+++ b/arch/ia64/include/asm/sn/rw_mmr.h
diff --git a/include/asm-ia64/sn/shub_mmr.h b/arch/ia64/include/asm/sn/shub_mmr.h
index 7de1d1d4b71..7de1d1d4b71 100644
--- a/include/asm-ia64/sn/shub_mmr.h
+++ b/arch/ia64/include/asm/sn/shub_mmr.h
diff --git a/include/asm-ia64/sn/shubio.h b/arch/ia64/include/asm/sn/shubio.h
index 22a6f18a531..22a6f18a531 100644
--- a/include/asm-ia64/sn/shubio.h
+++ b/arch/ia64/include/asm/sn/shubio.h
diff --git a/include/asm-ia64/sn/simulator.h b/arch/ia64/include/asm/sn/simulator.h
index c2611f6cfe3..c2611f6cfe3 100644
--- a/include/asm-ia64/sn/simulator.h
+++ b/arch/ia64/include/asm/sn/simulator.h
diff --git a/include/asm-ia64/sn/sn2/sn_hwperf.h b/arch/ia64/include/asm/sn/sn2/sn_hwperf.h
index e61ebac38cd..e61ebac38cd 100644
--- a/include/asm-ia64/sn/sn2/sn_hwperf.h
+++ b/arch/ia64/include/asm/sn/sn2/sn_hwperf.h
diff --git a/include/asm-ia64/sn/sn_cpuid.h b/arch/ia64/include/asm/sn/sn_cpuid.h
index a676dd9ace3..a676dd9ace3 100644
--- a/include/asm-ia64/sn/sn_cpuid.h
+++ b/arch/ia64/include/asm/sn/sn_cpuid.h
diff --git a/include/asm-ia64/sn/sn_feature_sets.h b/arch/ia64/include/asm/sn/sn_feature_sets.h
index 8e83ac117ac..8e83ac117ac 100644
--- a/include/asm-ia64/sn/sn_feature_sets.h
+++ b/arch/ia64/include/asm/sn/sn_feature_sets.h
diff --git a/include/asm-ia64/sn/sn_sal.h b/arch/ia64/include/asm/sn/sn_sal.h
index 676b31a08c6..57e649d388b 100644
--- a/include/asm-ia64/sn/sn_sal.h
+++ b/arch/ia64/include/asm/sn/sn_sal.h
@@ -1094,7 +1094,7 @@ ia64_sn_get_sn_info(int fc, u8 *shubtype, u16 *nasid_bitmask, u8 *nasid_shift,
/*
* This is the access point to the Altix PROM hardware performance
* and status monitoring interface. For info on using this, see
- * include/asm-ia64/sn/sn2/sn_hwperf.h
+ * arch/ia64/include/asm/sn/sn2/sn_hwperf.h
*/
static inline int
ia64_sn_hwperf_op(nasid_t nasid, u64 opcode, u64 a0, u64 a1, u64 a2,
diff --git a/include/asm-ia64/sn/tioca.h b/arch/ia64/include/asm/sn/tioca.h
index 666222d7f0f..666222d7f0f 100644
--- a/include/asm-ia64/sn/tioca.h
+++ b/arch/ia64/include/asm/sn/tioca.h
diff --git a/include/asm-ia64/sn/tioca_provider.h b/arch/ia64/include/asm/sn/tioca_provider.h
index 9a820ac61be..9a820ac61be 100644
--- a/include/asm-ia64/sn/tioca_provider.h
+++ b/arch/ia64/include/asm/sn/tioca_provider.h
diff --git a/include/asm-ia64/sn/tioce.h b/arch/ia64/include/asm/sn/tioce.h
index 893468e1b41..893468e1b41 100644
--- a/include/asm-ia64/sn/tioce.h
+++ b/arch/ia64/include/asm/sn/tioce.h
diff --git a/include/asm-ia64/sn/tioce_provider.h b/arch/ia64/include/asm/sn/tioce_provider.h
index 32c32f30b09..32c32f30b09 100644
--- a/include/asm-ia64/sn/tioce_provider.h
+++ b/arch/ia64/include/asm/sn/tioce_provider.h
diff --git a/include/asm-ia64/sn/tiocp.h b/arch/ia64/include/asm/sn/tiocp.h
index e8ad0bb5b6c..e8ad0bb5b6c 100644
--- a/include/asm-ia64/sn/tiocp.h
+++ b/arch/ia64/include/asm/sn/tiocp.h
diff --git a/include/asm-ia64/sn/tiocx.h b/arch/ia64/include/asm/sn/tiocx.h
index d29728492f3..d29728492f3 100644
--- a/include/asm-ia64/sn/tiocx.h
+++ b/arch/ia64/include/asm/sn/tiocx.h
diff --git a/include/asm-ia64/sn/types.h b/arch/ia64/include/asm/sn/types.h
index 8e04ee211e5..8e04ee211e5 100644
--- a/include/asm-ia64/sn/types.h
+++ b/arch/ia64/include/asm/sn/types.h
diff --git a/include/asm-ia64/socket.h b/arch/ia64/include/asm/socket.h
index d5ef0aa3e31..d5ef0aa3e31 100644
--- a/include/asm-ia64/socket.h
+++ b/arch/ia64/include/asm/socket.h
diff --git a/include/asm-ia64/sockios.h b/arch/ia64/include/asm/sockios.h
index 15c92468ad3..15c92468ad3 100644
--- a/include/asm-ia64/sockios.h
+++ b/arch/ia64/include/asm/sockios.h
diff --git a/include/asm-ia64/sparsemem.h b/arch/ia64/include/asm/sparsemem.h
index 67a7c40ec27..67a7c40ec27 100644
--- a/include/asm-ia64/sparsemem.h
+++ b/arch/ia64/include/asm/sparsemem.h
diff --git a/include/asm-ia64/spinlock.h b/arch/ia64/include/asm/spinlock.h
index 0229fb95fb3..0229fb95fb3 100644
--- a/include/asm-ia64/spinlock.h
+++ b/arch/ia64/include/asm/spinlock.h
diff --git a/include/asm-ia64/spinlock_types.h b/arch/ia64/include/asm/spinlock_types.h
index 474e46f1ab4..474e46f1ab4 100644
--- a/include/asm-ia64/spinlock_types.h
+++ b/arch/ia64/include/asm/spinlock_types.h
diff --git a/include/asm-ia64/stat.h b/arch/ia64/include/asm/stat.h
index 367bb90cdff..367bb90cdff 100644
--- a/include/asm-ia64/stat.h
+++ b/arch/ia64/include/asm/stat.h
diff --git a/include/asm-ia64/statfs.h b/arch/ia64/include/asm/statfs.h
index 811097974f3..811097974f3 100644
--- a/include/asm-ia64/statfs.h
+++ b/arch/ia64/include/asm/statfs.h
diff --git a/include/asm-ia64/string.h b/arch/ia64/include/asm/string.h
index 85fd65c52a8..85fd65c52a8 100644
--- a/include/asm-ia64/string.h
+++ b/arch/ia64/include/asm/string.h
diff --git a/include/asm-ia64/suspend.h b/arch/ia64/include/asm/suspend.h
index b05bbb6074e..b05bbb6074e 100644
--- a/include/asm-ia64/suspend.h
+++ b/arch/ia64/include/asm/suspend.h
diff --git a/include/asm-ia64/system.h b/arch/ia64/include/asm/system.h
index 927a381c20c..927a381c20c 100644
--- a/include/asm-ia64/system.h
+++ b/arch/ia64/include/asm/system.h
diff --git a/include/asm-ia64/termbits.h b/arch/ia64/include/asm/termbits.h
index 9f162e0089a..9f162e0089a 100644
--- a/include/asm-ia64/termbits.h
+++ b/arch/ia64/include/asm/termbits.h
diff --git a/include/asm-ia64/termios.h b/arch/ia64/include/asm/termios.h
index 689d218c0c2..689d218c0c2 100644
--- a/include/asm-ia64/termios.h
+++ b/arch/ia64/include/asm/termios.h
diff --git a/include/asm-ia64/thread_info.h b/arch/ia64/include/asm/thread_info.h
index 7c60fcdd2ef..7c60fcdd2ef 100644
--- a/include/asm-ia64/thread_info.h
+++ b/arch/ia64/include/asm/thread_info.h
diff --git a/include/asm-ia64/timex.h b/arch/ia64/include/asm/timex.h
index 05a6baf8a47..05a6baf8a47 100644
--- a/include/asm-ia64/timex.h
+++ b/arch/ia64/include/asm/timex.h
diff --git a/include/asm-ia64/tlb.h b/arch/ia64/include/asm/tlb.h
index 20d8a39680c..20d8a39680c 100644
--- a/include/asm-ia64/tlb.h
+++ b/arch/ia64/include/asm/tlb.h
diff --git a/include/asm-ia64/tlbflush.h b/arch/ia64/include/asm/tlbflush.h
index 3be25dfed16..3be25dfed16 100644
--- a/include/asm-ia64/tlbflush.h
+++ b/arch/ia64/include/asm/tlbflush.h
diff --git a/include/asm-ia64/topology.h b/arch/ia64/include/asm/topology.h
index 32863b3bb1d..35bcb641c9e 100644
--- a/include/asm-ia64/topology.h
+++ b/arch/ia64/include/asm/topology.h
@@ -1,6 +1,4 @@
/*
- * linux/include/asm-ia64/topology.h
- *
* Copyright (C) 2002, Erich Focht, NEC
*
* All rights reserved.
diff --git a/include/asm-ia64/types.h b/arch/ia64/include/asm/types.h
index e36b3716e71..e36b3716e71 100644
--- a/include/asm-ia64/types.h
+++ b/arch/ia64/include/asm/types.h
diff --git a/include/asm-ia64/uaccess.h b/arch/ia64/include/asm/uaccess.h
index 449c8c0fa2b..449c8c0fa2b 100644
--- a/include/asm-ia64/uaccess.h
+++ b/arch/ia64/include/asm/uaccess.h
diff --git a/include/asm-ia64/ucontext.h b/arch/ia64/include/asm/ucontext.h
index bf573dc8ca6..bf573dc8ca6 100644
--- a/include/asm-ia64/ucontext.h
+++ b/arch/ia64/include/asm/ucontext.h
diff --git a/include/asm-ia64/unaligned.h b/arch/ia64/include/asm/unaligned.h
index 7bddc7f5858..7bddc7f5858 100644
--- a/include/asm-ia64/unaligned.h
+++ b/arch/ia64/include/asm/unaligned.h
diff --git a/include/asm-ia64/uncached.h b/arch/ia64/include/asm/uncached.h
index 13d7e65ca3c..13d7e65ca3c 100644
--- a/include/asm-ia64/uncached.h
+++ b/arch/ia64/include/asm/uncached.h
diff --git a/include/asm-ia64/unistd.h b/arch/ia64/include/asm/unistd.h
index d535833aab5..d535833aab5 100644
--- a/include/asm-ia64/unistd.h
+++ b/arch/ia64/include/asm/unistd.h
diff --git a/include/asm-ia64/unwind.h b/arch/ia64/include/asm/unwind.h
index 1af3875f1a5..1af3875f1a5 100644
--- a/include/asm-ia64/unwind.h
+++ b/arch/ia64/include/asm/unwind.h
diff --git a/include/asm-ia64/user.h b/arch/ia64/include/asm/user.h
index 8b982111034..8b982111034 100644
--- a/include/asm-ia64/user.h
+++ b/arch/ia64/include/asm/user.h
diff --git a/include/asm-ia64/ustack.h b/arch/ia64/include/asm/ustack.h
index 504167c35b8..504167c35b8 100644
--- a/include/asm-ia64/ustack.h
+++ b/arch/ia64/include/asm/ustack.h
diff --git a/include/asm-ia64/uv/uv_hub.h b/arch/ia64/include/asm/uv/uv_hub.h
index f607018af4a..f607018af4a 100644
--- a/include/asm-ia64/uv/uv_hub.h
+++ b/arch/ia64/include/asm/uv/uv_hub.h
diff --git a/include/asm-ia64/uv/uv_mmrs.h b/arch/ia64/include/asm/uv/uv_mmrs.h
index c149ef08543..c149ef08543 100644
--- a/include/asm-ia64/uv/uv_mmrs.h
+++ b/arch/ia64/include/asm/uv/uv_mmrs.h
diff --git a/include/asm-ia64/vga.h b/arch/ia64/include/asm/vga.h
index 02184ecd820..02184ecd820 100644
--- a/include/asm-ia64/vga.h
+++ b/arch/ia64/include/asm/vga.h
diff --git a/include/asm-ia64/xor.h b/arch/ia64/include/asm/xor.h
index 41fb8744d17..a349e23dea1 100644
--- a/include/asm-ia64/xor.h
+++ b/arch/ia64/include/asm/xor.h
@@ -1,6 +1,4 @@
/*
- * include/asm-ia64/xor.h
- *
* Optimized RAID-5 checksumming functions for IA-64.
*
* This program is free software; you can redistribute it and/or modify
diff --git a/arch/ia64/kernel/asm-offsets.c b/arch/ia64/kernel/asm-offsets.c
index c64a55af9b9..94c44b1ccfd 100644
--- a/arch/ia64/kernel/asm-offsets.c
+++ b/arch/ia64/kernel/asm-offsets.c
@@ -10,11 +10,11 @@
#include <linux/pid.h>
#include <linux/clocksource.h>
#include <linux/kbuild.h>
-#include <asm-ia64/processor.h>
-#include <asm-ia64/ptrace.h>
-#include <asm-ia64/siginfo.h>
-#include <asm-ia64/sigcontext.h>
-#include <asm-ia64/mca.h>
+#include <asm/processor.h>
+#include <asm/ptrace.h>
+#include <asm/siginfo.h>
+#include <asm/sigcontext.h>
+#include <asm/mca.h>
#include "../kernel/sigframe.h"
#include "../kernel/fsyscall_gtod_data.h"
diff --git a/arch/ia64/kernel/head.S b/arch/ia64/kernel/head.S
index db540e58c78..41c712917ff 100644
--- a/arch/ia64/kernel/head.S
+++ b/arch/ia64/kernel/head.S
@@ -1123,7 +1123,7 @@ SET_REG(b5);
* p15 - used to track flag status.
*
* If you patch this code to use more registers, do not forget to update
- * the clobber lists for spin_lock() in include/asm-ia64/spinlock.h.
+ * the clobber lists for spin_lock() in arch/ia64/include/asm/spinlock.h.
*/
#if (__GNUC__ == 3 && __GNUC_MINOR__ < 3)
diff --git a/arch/ia64/kernel/iosapic.c b/arch/ia64/kernel/iosapic.c
index 3bc2fa64f87..5c4674ae8ae 100644
--- a/arch/ia64/kernel/iosapic.c
+++ b/arch/ia64/kernel/iosapic.c
@@ -69,7 +69,7 @@
* systems, we use one-to-one mapping between IA-64 vector and IRQ. A
* platform can implement platform_irq_to_vector(irq) and
* platform_local_vector_to_irq(vector) APIs to differentiate the mapping.
- * Please see also include/asm-ia64/hw_irq.h for those APIs.
+ * Please see also arch/ia64/include/asm/hw_irq.h for those APIs.
*
* To sum up, there are three levels of mappings involved:
*
diff --git a/arch/ia64/kernel/jprobes.S b/arch/ia64/kernel/jprobes.S
index 621630256c4..f69389c7be1 100644
--- a/arch/ia64/kernel/jprobes.S
+++ b/arch/ia64/kernel/jprobes.S
@@ -45,7 +45,7 @@
* to the correct location.
*/
#include <asm/asmmacro.h>
-#include <asm-ia64/break.h>
+#include <asm/break.h>
/*
* void jprobe_break(void)
diff --git a/arch/ia64/kernel/nr-irqs.c b/arch/ia64/kernel/nr-irqs.c
index 1ae049181e8..8273afc32db 100644
--- a/arch/ia64/kernel/nr-irqs.c
+++ b/arch/ia64/kernel/nr-irqs.c
@@ -9,7 +9,7 @@
#include <linux/kbuild.h>
#include <linux/threads.h>
-#include <asm-ia64/native/irq.h>
+#include <asm/native/irq.h>
void foo(void)
{
diff --git a/arch/ia64/kernel/setup.c b/arch/ia64/kernel/setup.c
index e5c2de9b29a..593279f33e9 100644
--- a/arch/ia64/kernel/setup.c
+++ b/arch/ia64/kernel/setup.c
@@ -314,7 +314,7 @@ static inline void __init setup_crashkernel(unsigned long total, int *n)
*
* Setup the reserved memory areas set aside for the boot parameters,
* initrd, etc. There are currently %IA64_MAX_RSVD_REGIONS defined,
- * see include/asm-ia64/meminit.h if you need to define more.
+ * see arch/ia64/include/asm/meminit.h if you need to define more.
*/
void __init
reserve_memory (void)
diff --git a/arch/ia64/sn/kernel/iomv.c b/arch/ia64/sn/kernel/iomv.c
index ab7e2fd4079..c77ebdf9811 100644
--- a/arch/ia64/sn/kernel/iomv.c
+++ b/arch/ia64/sn/kernel/iomv.c
@@ -63,7 +63,7 @@ EXPORT_SYMBOL(sn_io_addr);
/**
* __sn_mmiowb - I/O space memory barrier
*
- * See include/asm-ia64/io.h and Documentation/DocBook/deviceiobook.tmpl
+ * See arch/ia64/include/asm/io.h and Documentation/DocBook/deviceiobook.tmpl
* for details.
*
* On SN2, we wait for the PIO_WRITE_STATUS SHub register to clear.