Merge git://git.kernel.org/pub/scm/linux/kernel/git/dhowells/linux-2.…

…6-frv * git://git.kernel.org/pub/scm/linux/kernel/git/dhowells/linux-2.6-frv: FRV: Move to arch/frv/include/asm/ FRV: Fix indentation errors to keep git-am happy when moving arch header files
mariux64 · Apr 10, 2009 · 5de4c51 · 5de4c51
2 parents 6594d0b + e69cc92
commit 5de4c51
Show file tree

Hide file tree

Showing 114 changed files with 3 additions and 3 deletions.
diff --git a/include/asm-frv/Kbuild → arch/frv/include/asm/Kbuild b/include/asm-frv/Kbuild → arch/frv/include/asm/Kbuild
diff --git a/include/asm-frv/atomic.h → arch/frv/include/asm/atomic.h b/include/asm-frv/atomic.h → arch/frv/include/asm/atomic.h
diff --git a/include/asm-frv/auxvec.h → arch/frv/include/asm/auxvec.h b/include/asm-frv/auxvec.h → arch/frv/include/asm/auxvec.h
diff --git a/include/asm-frv/ax88796.h → arch/frv/include/asm/ax88796.h b/include/asm-frv/ax88796.h → arch/frv/include/asm/ax88796.h
diff --git a/include/asm-frv/bitops.h → arch/frv/include/asm/bitops.h b/include/asm-frv/bitops.h → arch/frv/include/asm/bitops.h
diff --git a/include/asm-frv/bug.h → arch/frv/include/asm/bug.h b/include/asm-frv/bug.h → arch/frv/include/asm/bug.h
diff --git a/include/asm-frv/bugs.h → arch/frv/include/asm/bugs.h b/include/asm-frv/bugs.h → arch/frv/include/asm/bugs.h
diff --git a/include/asm-frv/busctl-regs.h → arch/frv/include/asm/busctl-regs.h b/include/asm-frv/busctl-regs.h → arch/frv/include/asm/busctl-regs.h
diff --git a/include/asm-frv/byteorder.h → arch/frv/include/asm/byteorder.h b/include/asm-frv/byteorder.h → arch/frv/include/asm/byteorder.h
diff --git a/include/asm-frv/cache.h → arch/frv/include/asm/cache.h b/include/asm-frv/cache.h → arch/frv/include/asm/cache.h
diff --git a/include/asm-frv/cacheflush.h → arch/frv/include/asm/cacheflush.h b/include/asm-frv/cacheflush.h → arch/frv/include/asm/cacheflush.h
diff --git a/include/asm-frv/checksum.h → arch/frv/include/asm/checksum.h b/include/asm-frv/checksum.h → arch/frv/include/asm/checksum.h
diff --git a/include/asm-frv/cpu-irqs.h → arch/frv/include/asm/cpu-irqs.h b/include/asm-frv/cpu-irqs.h → arch/frv/include/asm/cpu-irqs.h
diff --git a/include/asm-frv/cpumask.h → arch/frv/include/asm/cpumask.h b/include/asm-frv/cpumask.h → arch/frv/include/asm/cpumask.h
diff --git a/include/asm-frv/cputime.h → arch/frv/include/asm/cputime.h b/include/asm-frv/cputime.h → arch/frv/include/asm/cputime.h
diff --git a/include/asm-frv/current.h → arch/frv/include/asm/current.h b/include/asm-frv/current.h → arch/frv/include/asm/current.h
diff --git a/include/asm-frv/delay.h → arch/frv/include/asm/delay.h b/include/asm-frv/delay.h → arch/frv/include/asm/delay.h
diff --git a/include/asm-frv/device.h → arch/frv/include/asm/device.h b/include/asm-frv/device.h → arch/frv/include/asm/device.h
diff --git a/include/asm-frv/div64.h → arch/frv/include/asm/div64.h b/include/asm-frv/div64.h → arch/frv/include/asm/div64.h
diff --git a/include/asm-frv/dm9000.h → arch/frv/include/asm/dm9000.h b/include/asm-frv/dm9000.h → arch/frv/include/asm/dm9000.h
diff --git a/include/asm-frv/dma-mapping.h → arch/frv/include/asm/dma-mapping.h b/include/asm-frv/dma-mapping.h → arch/frv/include/asm/dma-mapping.h
diff --git a/include/asm-frv/dma.h → arch/frv/include/asm/dma.h b/include/asm-frv/dma.h → arch/frv/include/asm/dma.h
diff --git a/include/asm-frv/elf.h → arch/frv/include/asm/elf.h b/include/asm-frv/elf.h → arch/frv/include/asm/elf.h
diff --git a/include/asm-frv/emergency-restart.h → arch/frv/include/asm/emergency-restart.h b/include/asm-frv/emergency-restart.h → arch/frv/include/asm/emergency-restart.h
diff --git a/include/asm-frv/errno.h → arch/frv/include/asm/errno.h b/include/asm-frv/errno.h → arch/frv/include/asm/errno.h
diff --git a/include/asm-frv/fb.h → arch/frv/include/asm/fb.h b/include/asm-frv/fb.h → arch/frv/include/asm/fb.h
diff --git a/include/asm-frv/fcntl.h → arch/frv/include/asm/fcntl.h b/include/asm-frv/fcntl.h → arch/frv/include/asm/fcntl.h
diff --git a/include/asm-frv/fpu.h → arch/frv/include/asm/fpu.h b/include/asm-frv/fpu.h → arch/frv/include/asm/fpu.h
diff --git a/include/asm-frv/ftrace.h → arch/frv/include/asm/ftrace.h b/include/asm-frv/ftrace.h → arch/frv/include/asm/ftrace.h
diff --git a/include/asm-frv/futex.h → arch/frv/include/asm/futex.h b/include/asm-frv/futex.h → arch/frv/include/asm/futex.h
diff --git a/include/asm-frv/gdb-stub.h → arch/frv/include/asm/gdb-stub.h b/include/asm-frv/gdb-stub.h → arch/frv/include/asm/gdb-stub.h
diff --git a/include/asm-frv/gpio-regs.h → arch/frv/include/asm/gpio-regs.h b/include/asm-frv/gpio-regs.h → arch/frv/include/asm/gpio-regs.h
diff --git a/include/asm-frv/hardirq.h → arch/frv/include/asm/hardirq.h b/include/asm-frv/hardirq.h → arch/frv/include/asm/hardirq.h
diff --git a/include/asm-frv/highmem.h → arch/frv/include/asm/highmem.h b/include/asm-frv/highmem.h → arch/frv/include/asm/highmem.h
diff --git a/include/asm-frv/hw_irq.h → arch/frv/include/asm/hw_irq.h b/include/asm-frv/hw_irq.h → arch/frv/include/asm/hw_irq.h
diff --git a/include/asm-frv/init.h → arch/frv/include/asm/init.h b/include/asm-frv/init.h → arch/frv/include/asm/init.h
diff --git a/include/asm-frv/io.h → arch/frv/include/asm/io.h b/include/asm-frv/io.h → arch/frv/include/asm/io.h
diff --git a/include/asm-frv/ioctl.h → arch/frv/include/asm/ioctl.h b/include/asm-frv/ioctl.h → arch/frv/include/asm/ioctl.h
diff --git a/include/asm-frv/ioctls.h → arch/frv/include/asm/ioctls.h b/include/asm-frv/ioctls.h → arch/frv/include/asm/ioctls.h
diff --git a/include/asm-frv/ipcbuf.h → arch/frv/include/asm/ipcbuf.h b/include/asm-frv/ipcbuf.h → arch/frv/include/asm/ipcbuf.h
diff --git a/include/asm-frv/irc-regs.h → arch/frv/include/asm/irc-regs.h b/include/asm-frv/irc-regs.h → arch/frv/include/asm/irc-regs.h
diff --git a/include/asm-frv/irq.h → arch/frv/include/asm/irq.h b/include/asm-frv/irq.h → arch/frv/include/asm/irq.h
diff --git a/include/asm-frv/irq_regs.h → arch/frv/include/asm/irq_regs.h b/include/asm-frv/irq_regs.h → arch/frv/include/asm/irq_regs.h
diff --git a/include/asm-frv/kdebug.h → arch/frv/include/asm/kdebug.h b/include/asm-frv/kdebug.h → arch/frv/include/asm/kdebug.h
diff --git a/include/asm-frv/kmap_types.h → arch/frv/include/asm/kmap_types.h b/include/asm-frv/kmap_types.h → arch/frv/include/asm/kmap_types.h
diff --git a/include/asm-frv/linkage.h → arch/frv/include/asm/linkage.h b/include/asm-frv/linkage.h → arch/frv/include/asm/linkage.h
diff --git a/include/asm-frv/local.h → arch/frv/include/asm/local.h b/include/asm-frv/local.h → arch/frv/include/asm/local.h
diff --git a/include/asm-frv/math-emu.h → arch/frv/include/asm/math-emu.h b/include/asm-frv/math-emu.h → arch/frv/include/asm/math-emu.h
diff --git a/include/asm-frv/mb-regs.h → arch/frv/include/asm/mb-regs.h b/include/asm-frv/mb-regs.h → arch/frv/include/asm/mb-regs.h
diff --git a/include/asm-frv/mb86943a.h → arch/frv/include/asm/mb86943a.h b/include/asm-frv/mb86943a.h → arch/frv/include/asm/mb86943a.h
diff --git a/include/asm-frv/mb93091-fpga-irqs.h → arch/frv/include/asm/mb93091-fpga-irqs.h b/include/asm-frv/mb93091-fpga-irqs.h → arch/frv/include/asm/mb93091-fpga-irqs.h
diff --git a/include/asm-frv/mb93093-fpga-irqs.h → arch/frv/include/asm/mb93093-fpga-irqs.h b/include/asm-frv/mb93093-fpga-irqs.h → arch/frv/include/asm/mb93093-fpga-irqs.h
diff --git a/include/asm-frv/mb93493-irqs.h → arch/frv/include/asm/mb93493-irqs.h b/include/asm-frv/mb93493-irqs.h → arch/frv/include/asm/mb93493-irqs.h
diff --git a/include/asm-frv/mb93493-regs.h → arch/frv/include/asm/mb93493-regs.h b/include/asm-frv/mb93493-regs.h → arch/frv/include/asm/mb93493-regs.h
diff --git a/include/asm-frv/mc146818rtc.h → arch/frv/include/asm/mc146818rtc.h b/include/asm-frv/mc146818rtc.h → arch/frv/include/asm/mc146818rtc.h
diff --git a/include/asm-frv/mem-layout.h → arch/frv/include/asm/mem-layout.h b/include/asm-frv/mem-layout.h → arch/frv/include/asm/mem-layout.h
diff --git a/include/asm-frv/mman.h → arch/frv/include/asm/mman.h b/include/asm-frv/mman.h → arch/frv/include/asm/mman.h
diff --git a/include/asm-frv/mmu.h → arch/frv/include/asm/mmu.h b/include/asm-frv/mmu.h → arch/frv/include/asm/mmu.h
diff --git a/include/asm-frv/mmu_context.h → arch/frv/include/asm/mmu_context.h b/include/asm-frv/mmu_context.h → arch/frv/include/asm/mmu_context.h
diff --git a/include/asm-frv/module.h → arch/frv/include/asm/module.h b/include/asm-frv/module.h → arch/frv/include/asm/module.h
diff --git a/include/asm-frv/msgbuf.h → arch/frv/include/asm/msgbuf.h b/include/asm-frv/msgbuf.h → arch/frv/include/asm/msgbuf.h
diff --git a/include/asm-frv/mutex.h → arch/frv/include/asm/mutex.h b/include/asm-frv/mutex.h → arch/frv/include/asm/mutex.h
diff --git a/include/asm-frv/page.h → arch/frv/include/asm/page.h b/include/asm-frv/page.h → arch/frv/include/asm/page.h
diff --git a/include/asm-frv/param.h → arch/frv/include/asm/param.h b/include/asm-frv/param.h → arch/frv/include/asm/param.h
diff --git a/include/asm-frv/pci.h → arch/frv/include/asm/pci.h b/include/asm-frv/pci.h → arch/frv/include/asm/pci.h
diff --git a/include/asm-frv/percpu.h → arch/frv/include/asm/percpu.h b/include/asm-frv/percpu.h → arch/frv/include/asm/percpu.h
diff --git a/include/asm-frv/pgalloc.h → arch/frv/include/asm/pgalloc.h b/include/asm-frv/pgalloc.h → arch/frv/include/asm/pgalloc.h
diff --git a/include/asm-frv/pgtable.h → arch/frv/include/asm/pgtable.h b/include/asm-frv/pgtable.h → arch/frv/include/asm/pgtable.h
diff --git a/include/asm-frv/poll.h → arch/frv/include/asm/poll.h b/include/asm-frv/poll.h → arch/frv/include/asm/poll.h
diff --git a/include/asm-frv/posix_types.h → arch/frv/include/asm/posix_types.h b/include/asm-frv/posix_types.h → arch/frv/include/asm/posix_types.h
diff --git a/include/asm-frv/processor.h → arch/frv/include/asm/processor.h b/include/asm-frv/processor.h → arch/frv/include/asm/processor.h
diff --git a/include/asm-frv/ptrace.h → arch/frv/include/asm/ptrace.h b/include/asm-frv/ptrace.h → arch/frv/include/asm/ptrace.h
diff --git a/include/asm-frv/registers.h → arch/frv/include/asm/registers.h b/include/asm-frv/registers.h → arch/frv/include/asm/registers.h
diff --git a/include/asm-frv/resource.h → arch/frv/include/asm/resource.h b/include/asm-frv/resource.h → arch/frv/include/asm/resource.h
diff --git a/include/asm-frv/scatterlist.h → arch/frv/include/asm/scatterlist.h b/include/asm-frv/scatterlist.h → arch/frv/include/asm/scatterlist.h
diff --git a/include/asm-frv/sections.h → arch/frv/include/asm/sections.h b/include/asm-frv/sections.h → arch/frv/include/asm/sections.h
diff --git a/include/asm-frv/segment.h → arch/frv/include/asm/segment.h b/include/asm-frv/segment.h → arch/frv/include/asm/segment.h
diff --git a/include/asm-frv/sembuf.h → arch/frv/include/asm/sembuf.h b/include/asm-frv/sembuf.h → arch/frv/include/asm/sembuf.h
diff --git a/include/asm-frv/serial-regs.h → arch/frv/include/asm/serial-regs.h b/include/asm-frv/serial-regs.h → arch/frv/include/asm/serial-regs.h
diff --git a/include/asm-frv/serial.h → arch/frv/include/asm/serial.h b/include/asm-frv/serial.h → arch/frv/include/asm/serial.h
diff --git a/include/asm-frv/setup.h → arch/frv/include/asm/setup.h b/include/asm-frv/setup.h → arch/frv/include/asm/setup.h
diff --git a/include/asm-frv/shmbuf.h → arch/frv/include/asm/shmbuf.h b/include/asm-frv/shmbuf.h → arch/frv/include/asm/shmbuf.h
diff --git a/include/asm-frv/shmparam.h → arch/frv/include/asm/shmparam.h b/include/asm-frv/shmparam.h → arch/frv/include/asm/shmparam.h
diff --git a/include/asm-frv/sigcontext.h → arch/frv/include/asm/sigcontext.h b/include/asm-frv/sigcontext.h → arch/frv/include/asm/sigcontext.h
diff --git a/include/asm-frv/siginfo.h → arch/frv/include/asm/siginfo.h b/include/asm-frv/siginfo.h → arch/frv/include/asm/siginfo.h
diff --git a/include/asm-frv/signal.h → arch/frv/include/asm/signal.h b/include/asm-frv/signal.h → arch/frv/include/asm/signal.h
diff --git a/include/asm-frv/smp.h → arch/frv/include/asm/smp.h b/include/asm-frv/smp.h → arch/frv/include/asm/smp.h
diff --git a/include/asm-frv/socket.h → arch/frv/include/asm/socket.h b/include/asm-frv/socket.h → arch/frv/include/asm/socket.h
diff --git a/include/asm-frv/sockios.h → arch/frv/include/asm/sockios.h b/include/asm-frv/sockios.h → arch/frv/include/asm/sockios.h
diff --git a/include/asm-frv/spinlock.h → arch/frv/include/asm/spinlock.h b/include/asm-frv/spinlock.h → arch/frv/include/asm/spinlock.h
diff --git a/include/asm-frv/spr-regs.h → arch/frv/include/asm/spr-regs.h b/include/asm-frv/spr-regs.h → arch/frv/include/asm/spr-regs.h
diff --git a/include/asm-frv/stat.h → arch/frv/include/asm/stat.h b/include/asm-frv/stat.h → arch/frv/include/asm/stat.h
diff --git a/include/asm-frv/statfs.h → arch/frv/include/asm/statfs.h b/include/asm-frv/statfs.h → arch/frv/include/asm/statfs.h
diff --git a/include/asm-frv/string.h → arch/frv/include/asm/string.h b/include/asm-frv/string.h → arch/frv/include/asm/string.h
diff --git a/include/asm-frv/suspend.h → arch/frv/include/asm/suspend.h b/include/asm-frv/suspend.h → arch/frv/include/asm/suspend.h
diff --git a/include/asm-frv/swab.h → arch/frv/include/asm/swab.h b/include/asm-frv/swab.h → arch/frv/include/asm/swab.h
diff --git a/include/asm-frv/system.h → arch/frv/include/asm/system.h b/include/asm-frv/system.h → arch/frv/include/asm/system.h
diff --git a/include/asm-frv/termbits.h → arch/frv/include/asm/termbits.h b/include/asm-frv/termbits.h → arch/frv/include/asm/termbits.h
diff --git a/include/asm-frv/termios.h → arch/frv/include/asm/termios.h b/include/asm-frv/termios.h → arch/frv/include/asm/termios.h
diff --git a/include/asm-frv/thread_info.h → arch/frv/include/asm/thread_info.h b/include/asm-frv/thread_info.h → arch/frv/include/asm/thread_info.h
@@ -38,9 +38,9 @@ struct thread_info {
 	int			preempt_count;	/* 0 => preemptable, <0 => BUG */
 
 	mm_segment_t		addr_limit;	/* thread address space:
-					 	   0-0xBFFFFFFF for user-thead
-						   0-0xFFFFFFFF for kernel-thread
-						*/
+						 * 0-0xBFFFFFFF for user-thead
+						 * 0-0xFFFFFFFF for kernel-thread
+						 */
 	struct restart_block    restart_block;
 
 	__u8			supervisor_stack[0];

diff --git a/include/asm-frv/timer-regs.h → arch/frv/include/asm/timer-regs.h b/include/asm-frv/timer-regs.h → arch/frv/include/asm/timer-regs.h
diff --git a/include/asm-frv/timex.h → arch/frv/include/asm/timex.h b/include/asm-frv/timex.h → arch/frv/include/asm/timex.h
diff --git a/include/asm-frv/tlb.h → arch/frv/include/asm/tlb.h b/include/asm-frv/tlb.h → arch/frv/include/asm/tlb.h
diff --git a/include/asm-frv/tlbflush.h → arch/frv/include/asm/tlbflush.h b/include/asm-frv/tlbflush.h → arch/frv/include/asm/tlbflush.h
diff --git a/include/asm-frv/topology.h → arch/frv/include/asm/topology.h b/include/asm-frv/topology.h → arch/frv/include/asm/topology.h
diff --git a/include/asm-frv/types.h → arch/frv/include/asm/types.h b/include/asm-frv/types.h → arch/frv/include/asm/types.h
diff --git a/include/asm-frv/uaccess.h → arch/frv/include/asm/uaccess.h b/include/asm-frv/uaccess.h → arch/frv/include/asm/uaccess.h
diff --git a/include/asm-frv/ucontext.h → arch/frv/include/asm/ucontext.h b/include/asm-frv/ucontext.h → arch/frv/include/asm/ucontext.h
diff --git a/include/asm-frv/unaligned.h → arch/frv/include/asm/unaligned.h b/include/asm-frv/unaligned.h → arch/frv/include/asm/unaligned.h
diff --git a/include/asm-frv/unistd.h → arch/frv/include/asm/unistd.h b/include/asm-frv/unistd.h → arch/frv/include/asm/unistd.h
diff --git a/include/asm-frv/user.h → arch/frv/include/asm/user.h b/include/asm-frv/user.h → arch/frv/include/asm/user.h
diff --git a/include/asm-frv/vga.h → arch/frv/include/asm/vga.h b/include/asm-frv/vga.h → arch/frv/include/asm/vga.h
diff --git a/include/asm-frv/virtconvert.h → arch/frv/include/asm/virtconvert.h b/include/asm-frv/virtconvert.h → arch/frv/include/asm/virtconvert.h
diff --git a/include/asm-frv/xor.h → arch/frv/include/asm/xor.h b/include/asm-frv/xor.h → arch/frv/include/asm/xor.h