diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2008-11-01 09:51:51 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2008-11-01 09:51:51 -0700 |
| commit | 0242909a6135e10a28822c64f9ad50fdad52757c (patch) | |
| tree | c5f9c8abe95a65433e6ac356871f2379c02488fe | |
| parent | 0a6d2fac615972142715d736289abeeb7382e81d (diff) | |
| parent | 556dcee7b829e5c350c3ffdbdb87a8b15aa3c5d3 (diff) | |
Merge branch 'cris_move' of git://www.jni.nu/cris
* 'cris_move' of git://www.jni.nu/cris:
[CRIS] Move header files from include to arch/cris/include.
[CRISv32] Remove warning in io.h
| -rw-r--r-- | arch/cris/Makefile | 26 | ||||
| -rw-r--r-- | arch/cris/arch-v10/boot/.gitignore | 2 | ||||
| -rw-r--r-- | arch/cris/arch-v10/boot/compressed/head.S | 2 | ||||
| -rw-r--r-- | arch/cris/arch-v10/boot/compressed/misc.c | 2 | ||||
| -rw-r--r-- | arch/cris/arch-v10/boot/rescue/head.S | 2 | ||||
| -rw-r--r-- | arch/cris/arch-v10/boot/rescue/kimagerescue.S | 2 | ||||
| -rw-r--r-- | arch/cris/arch-v10/boot/rescue/testrescue.S | 2 | ||||
| -rw-r--r-- | arch/cris/arch-v10/drivers/axisflashmap.c | 2 | ||||
| -rw-r--r-- | arch/cris/arch-v10/drivers/ds1302.c | 4 | ||||
| -rw-r--r-- | arch/cris/arch-v10/drivers/gpio.c | 4 | ||||
| -rw-r--r-- | arch/cris/arch-v10/drivers/i2c.c | 4 | ||||
| -rw-r--r-- | arch/cris/arch-v10/drivers/sync_serial.c | 4 | ||||
| -rw-r--r-- | arch/cris/arch-v10/kernel/crisksyms.c | 2 | ||||
| -rw-r--r-- | arch/cris/arch-v10/kernel/debugport.c | 2 | ||||
| -rw-r--r-- | arch/cris/arch-v10/kernel/dma.c | 2 | ||||
| -rw-r--r-- | arch/cris/arch-v10/kernel/entry.S | 2 | ||||
| -rw-r--r-- | arch/cris/arch-v10/kernel/fasttimer.c | 2 | ||||
| -rw-r--r-- | arch/cris/arch-v10/kernel/head.S | 2 | ||||
| -rw-r--r-- | arch/cris/arch-v10/kernel/io_interface_mux.c | 4 | ||||
| -rw-r--r-- | arch/cris/arch-v10/kernel/kgdb.c | 2 | ||||
| -rw-r--r-- | arch/cris/arch-v10/kernel/process.c | 2 | ||||
| -rw-r--r-- | arch/cris/arch-v10/kernel/time.c | 2 | ||||
| -rw-r--r-- | arch/cris/arch-v10/kernel/traps.c | 2 | ||||
| -rw-r--r-- | arch/cris/arch-v10/mm/fault.c | 2 | ||||
| -rw-r--r-- | arch/cris/arch-v10/mm/init.c | 2 | ||||
| -rw-r--r-- | arch/cris/arch-v10/mm/tlb.c | 2 | ||||
| -rw-r--r-- | arch/cris/arch-v32/boot/compressed/head.S | 4 | ||||
| -rw-r--r-- | arch/cris/arch-v32/drivers/mach-a3/gpio.c | 2 | ||||
| -rw-r--r-- | arch/cris/arch-v32/drivers/mach-a3/nandflash.c | 2 | ||||
| -rw-r--r-- | arch/cris/arch-v32/drivers/mach-fs/nandflash.c | 2 | ||||
| -rw-r--r-- | arch/cris/arch-v32/drivers/pci/bios.c | 2 | ||||
| -rw-r--r-- | arch/cris/arch-v32/kernel/cache.c | 4 | ||||
| -rw-r--r-- | arch/cris/arch-v32/kernel/crisksyms.c | 8 | ||||
| -rw-r--r-- | arch/cris/arch-v32/kernel/debugport.c | 2 | ||||
| -rw-r--r-- | arch/cris/arch-v32/kernel/entry.S | 4 | ||||
| -rw-r--r-- | arch/cris/arch-v32/kernel/head.S | 4 | ||||
| -rw-r--r-- | arch/cris/arch-v32/kernel/kgdb.c | 8 | ||||
| -rw-r--r-- | arch/cris/arch-v32/kernel/kgdb_asm.S | 2 | ||||
| -rw-r--r-- | arch/cris/arch-v32/kernel/pinmux.c | 8 | ||||
| -rw-r--r-- | arch/cris/arch-v32/kernel/ptrace.c | 2 | ||||
| -rw-r--r-- | arch/cris/arch-v32/kernel/signal.c | 4 | ||||
| -rw-r--r-- | arch/cris/arch-v32/lib/nand_init.S | 10 | ||||
| -rw-r--r-- | arch/cris/arch-v32/mach-a3/dma.c | 2 | ||||
| -rw-r--r-- | arch/cris/arch-v32/mach-a3/io.c | 2 | ||||
| -rw-r--r-- | arch/cris/arch-v32/mach-fs/cpufreq.c | 6 | ||||
| -rw-r--r-- | arch/cris/arch-v32/mach-fs/dma.c | 2 | ||||
| -rw-r--r-- | arch/cris/arch-v32/mach-fs/io.c | 4 | ||||
| -rw-r--r-- | arch/cris/arch-v32/mach-fs/vcs_hook.c | 4 | ||||
| -rw-r--r-- | arch/cris/arch-v32/mm/init.c | 4 | ||||
| -rw-r--r-- | arch/cris/arch-v32/mm/tlb.c | 4 | ||||
| -rw-r--r-- | arch/cris/include/arch-v10/arch/Kbuild (renamed from include/asm-cris/arch-v10/Kbuild) | 0 | ||||
| -rw-r--r-- | arch/cris/include/arch-v10/arch/atomic.h (renamed from include/asm-cris/arch-v10/atomic.h) | 0 | ||||
| -rw-r--r-- | arch/cris/include/arch-v10/arch/bitops.h (renamed from include/asm-cris/arch-v10/bitops.h) | 0 | ||||
| -rw-r--r-- | arch/cris/include/arch-v10/arch/bug.h (renamed from include/asm-cris/arch-v10/bug.h) | 0 | ||||
| -rw-r--r-- | arch/cris/include/arch-v10/arch/byteorder.h (renamed from include/asm-cris/arch-v10/byteorder.h) | 0 | ||||
| -rw-r--r-- | arch/cris/include/arch-v10/arch/cache.h (renamed from include/asm-cris/arch-v10/cache.h) | 0 | ||||
| -rw-r--r-- | arch/cris/include/arch-v10/arch/checksum.h (renamed from include/asm-cris/arch-v10/checksum.h) | 0 | ||||
| -rw-r--r-- | arch/cris/include/arch-v10/arch/delay.h (renamed from include/asm-cris/arch-v10/delay.h) | 0 | ||||
| -rw-r--r-- | arch/cris/include/arch-v10/arch/dma.h (renamed from include/asm-cris/arch-v10/dma.h) | 0 | ||||
| -rw-r--r-- | arch/cris/include/arch-v10/arch/elf.h (renamed from include/asm-cris/arch-v10/elf.h) | 0 | ||||
| -rw-r--r-- | arch/cris/include/arch-v10/arch/io.h (renamed from include/asm-cris/arch-v10/io.h) | 2 | ||||
| -rw-r--r-- | arch/cris/include/arch-v10/arch/io_interface_mux.h (renamed from include/asm-cris/arch-v10/io_interface_mux.h) | 0 | ||||
| -rw-r--r-- | arch/cris/include/arch-v10/arch/irq.h (renamed from include/asm-cris/arch-v10/irq.h) | 2 | ||||
| -rw-r--r-- | arch/cris/include/arch-v10/arch/memmap.h (renamed from include/asm-cris/arch-v10/memmap.h) | 0 | ||||
| -rw-r--r-- | arch/cris/include/arch-v10/arch/mmu.h (renamed from include/asm-cris/arch-v10/mmu.h) | 0 | ||||
| -rw-r--r-- | arch/cris/include/arch-v10/arch/offset.h (renamed from include/asm-cris/arch-v10/offset.h) | 0 | ||||
| -rw-r--r-- | arch/cris/include/arch-v10/arch/page.h (renamed from include/asm-cris/arch-v10/page.h) | 0 | ||||
| -rw-r--r-- | arch/cris/include/arch-v10/arch/pgtable.h (renamed from include/asm-cris/arch-v10/pgtable.h) | 0 | ||||
| -rw-r--r-- | arch/cris/include/arch-v10/arch/processor.h (renamed from include/asm-cris/arch-v10/processor.h) | 0 | ||||
| -rw-r--r-- | arch/cris/include/arch-v10/arch/ptrace.h (renamed from include/asm-cris/arch-v10/ptrace.h) | 0 | ||||
| -rw-r--r-- | arch/cris/include/arch-v10/arch/sv_addr.agh (renamed from include/asm-cris/arch-v10/sv_addr.agh) | 0 | ||||
| -rw-r--r-- | arch/cris/include/arch-v10/arch/sv_addr_ag.h (renamed from include/asm-cris/arch-v10/sv_addr_ag.h) | 0 | ||||
| -rw-r--r-- | arch/cris/include/arch-v10/arch/svinto.h (renamed from include/asm-cris/arch-v10/svinto.h) | 0 | ||||
| -rw-r--r-- | arch/cris/include/arch-v10/arch/system.h (renamed from include/asm-cris/arch-v10/system.h) | 0 | ||||
| -rw-r--r-- | arch/cris/include/arch-v10/arch/thread_info.h (renamed from include/asm-cris/arch-v10/thread_info.h) | 0 | ||||
| -rw-r--r-- | arch/cris/include/arch-v10/arch/timex.h (renamed from include/asm-cris/arch-v10/timex.h) | 0 | ||||
| -rw-r--r-- | arch/cris/include/arch-v10/arch/tlb.h (renamed from include/asm-cris/arch-v10/tlb.h) | 0 | ||||
| -rw-r--r-- | arch/cris/include/arch-v10/arch/uaccess.h (renamed from include/asm-cris/arch-v10/uaccess.h) | 0 | ||||
| -rw-r--r-- | arch/cris/include/arch-v10/arch/unistd.h (renamed from include/asm-cris/arch-v10/unistd.h) | 0 | ||||
| -rw-r--r-- | arch/cris/include/arch-v10/arch/user.h (renamed from include/asm-cris/arch-v10/user.h) | 0 | ||||
| -rw-r--r-- | arch/cris/include/arch-v32/arch/Kbuild (renamed from include/asm-cris/arch-v32/Kbuild) | 0 | ||||
| -rw-r--r-- | arch/cris/include/arch-v32/arch/atomic.h (renamed from include/asm-cris/arch-v32/atomic.h) | 0 | ||||
| -rw-r--r-- | arch/cris/include/arch-v32/arch/bitops.h (renamed from include/asm-cris/arch-v32/bitops.h) | 0 | ||||
| -rw-r--r-- | arch/cris/include/arch-v32/arch/bug.h (renamed from include/asm-cris/arch-v32/bug.h) | 0 | ||||
| -rw-r--r-- | arch/cris/include/arch-v32/arch/byteorder.h (renamed from include/asm-cris/arch-v32/byteorder.h) | 0 | ||||
| -rw-r--r-- | arch/cris/include/arch-v32/arch/cache.h (renamed from include/asm-cris/arch-v32/cache.h) | 2 | ||||
| -rw-r--r-- | arch/cris/include/arch-v32/arch/checksum.h (renamed from include/asm-cris/arch-v32/checksum.h) | 0 | ||||
| -rw-r--r-- | arch/cris/include/arch-v32/arch/cryptocop.h (renamed from include/asm-cris/arch-v32/cryptocop.h) | 2 | ||||
| -rw-r--r-- | arch/cris/include/arch-v32/arch/delay.h (renamed from include/asm-cris/arch-v32/delay.h) | 0 | ||||
| -rw-r--r-- | arch/cris/include/arch-v32/arch/dma.h (renamed from include/asm-cris/arch-v32/dma.h) | 0 | ||||
| -rw-r--r-- | arch/cris/include/arch-v32/arch/elf.h (renamed from include/asm-cris/arch-v32/elf.h) | 0 | ||||
| -rw-r--r-- | arch/cris/include/arch-v32/arch/hwregs/Makefile (renamed from include/asm-cris/arch-v32/hwregs/Makefile) | 0 | ||||
| -rw-r--r-- | arch/cris/include/arch-v32/arch/hwregs/asm/ata_defs_asm.h (renamed from include/asm-cris/arch-v32/hwregs/asm/ata_defs_asm.h) | 0 | ||||
| -rw-r--r-- | arch/cris/include/arch-v32/arch/hwregs/asm/bif_core_defs_asm.h (renamed from include/asm-cris/arch-v32/hwregs/asm/bif_core_defs_asm.h) | 0 | ||||
| -rw-r--r-- | arch/cris/include/arch-v32/arch/hwregs/asm/bif_dma_defs_asm.h (renamed from include/asm-cris/arch-v32/hwregs/asm/bif_dma_defs_asm.h) | 0 | ||||
| -rw-r--r-- | arch/cris/include/arch-v32/arch/hwregs/asm/bif_slave_defs_asm.h (renamed from include/asm-cris/arch-v32/hwregs/asm/bif_slave_defs_asm.h) | 0 | ||||
| -rw-r--r-- | arch/cris/include/arch-v32/arch/hwregs/asm/config_defs_asm.h (renamed from include/asm-cris/arch-v32/hwregs/asm/config_defs_asm.h) | 0 | ||||
| -rw-r--r-- | arch/cris/include/arch-v32/arch/hwregs/asm/cpu_vect.h (renamed from include/asm-cris/arch-v32/hwregs/asm/cpu_vect.h) | 0 | ||||
| -rw-r--r-- | arch/cris/include/arch-v32/arch/hwregs/asm/cris_defs_asm.h (renamed from include/asm-cris/arch-v32/hwregs/asm/cris_defs_asm.h) | 0 | ||||
| -rw-r--r-- | arch/cris/include/arch-v32/arch/hwregs/asm/cris_supp_reg.h (renamed from include/asm-cris/arch-v32/hwregs/asm/cris_supp_reg.h) | 0 | ||||
| -rw-r--r-- | arch/cris/include/arch-v32/arch/hwregs/asm/dma_defs_asm.h (renamed from include/asm-cris/arch-v32/hwregs/asm/dma_defs_asm.h) | 0 | ||||
| -rw-r--r-- | arch/cris/include/arch-v32/arch/hwregs/asm/eth_defs_asm.h (renamed from include/asm-cris/arch-v32/hwregs/asm/eth_defs_asm.h) | 0 | ||||
| -rw-r--r-- | arch/cris/include/arch-v32/arch/hwregs/asm/gio_defs_asm.h (renamed from include/asm-cris/arch-v32/hwregs/asm/gio_defs_asm.h) | 0 | ||||
| -rw-r--r-- | arch/cris/include/arch-v32/arch/hwregs/asm/intr_vect.h (renamed from include/asm-cris/arch-v32/hwregs/asm/intr_vect.h) | 0 | ||||
| -rw-r--r-- | arch/cris/include/arch-v32/arch/hwregs/asm/intr_vect_defs_asm.h (renamed from include/asm-cris/arch-v32/hwregs/asm/intr_vect_defs_asm.h) | 0 | ||||
| -rw-r--r-- | arch/cris/include/arch-v32/arch/hwregs/asm/irq_nmi_defs_asm.h (renamed from include/asm-cris/arch-v32/hwregs/asm/irq_nmi_defs_asm.h) | 0 | ||||
| -rw-r--r-- | arch/cris/include/arch-v32/arch/hwregs/asm/marb_defs_asm.h (renamed from include/asm-cris/arch-v32/hwregs/asm/marb_defs_asm.h) | 0 | ||||
| -rw-r--r-- | arch/cris/include/arch-v32/arch/hwregs/asm/mmu_defs_asm.h (renamed from include/asm-cris/arch-v32/hwregs/asm/mmu_defs_asm.h) | 0 | ||||
| -rw-r--r-- | arch/cris/include/arch-v32/arch/hwregs/asm/mmu_supp_reg.h (renamed from include/asm-cris/arch-v32/hwregs/asm/mmu_supp_reg.h) | 0 | ||||
| -rw-r--r-- | arch/cris/include/arch-v32/arch/hwregs/asm/rt_trace_defs_asm.h (renamed from include/asm-cris/arch-v32/hwregs/asm/rt_trace_defs_asm.h) | 0 | ||||
| -rw-r--r-- | arch/cris/include/arch-v32/arch/hwregs/asm/ser_defs_asm.h (renamed from include/asm-cris/arch-v32/hwregs/asm/ser_defs_asm.h) | 0 | ||||
| -rw-r--r-- | arch/cris/include/arch-v32/arch/hwregs/asm/sser_defs_asm.h (renamed from include/asm-cris/arch-v32/hwregs/asm/sser_defs_asm.h) | 0 | ||||
| -rw-r--r-- | arch/cris/include/arch-v32/arch/hwregs/asm/strcop_defs_asm.h (renamed from include/asm-cris/arch-v32/hwregs/asm/strcop_defs_asm.h) | 0 | ||||
| -rw-r--r-- | arch/cris/include/arch-v32/arch/hwregs/asm/strmux_defs_asm.h (renamed from include/asm-cris/arch-v32/hwregs/asm/strmux_defs_asm.h) | 0 | ||||
| -rw-r--r-- | arch/cris/include/arch-v32/arch/hwregs/asm/timer_defs_asm.h (renamed from include/asm-cris/arch-v32/hwregs/asm/timer_defs_asm.h) | 0 | ||||
| -rw-r--r-- | arch/cris/include/arch-v32/arch/hwregs/ata_defs.h (renamed from include/asm-cris/arch-v32/hwregs/ata_defs.h) | 0 | ||||
| -rw-r--r-- | arch/cris/include/arch-v32/arch/hwregs/bif_core_defs.h (renamed from include/asm-cris/arch-v32/hwregs/bif_core_defs.h) | 0 | ||||
| -rw-r--r-- | arch/cris/include/arch-v32/arch/hwregs/bif_dma_defs.h (renamed from include/asm-cris/arch-v32/hwregs/bif_dma_defs.h) | 0 | ||||
| -rw-r--r-- | arch/cris/include/arch-v32/arch/hwregs/bif_slave_defs.h (renamed from include/asm-cris/arch-v32/hwregs/bif_slave_defs.h) | 0 | ||||
| -rw-r--r-- | arch/cris/include/arch-v32/arch/hwregs/config_defs.h (renamed from include/asm-cris/arch-v32/hwregs/config_defs.h) | 0 | ||||
| -rw-r--r-- | arch/cris/include/arch-v32/arch/hwregs/cpu_vect.h (renamed from include/asm-cris/arch-v32/hwregs/cpu_vect.h) | 0 | ||||
| -rw-r--r-- | arch/cris/include/arch-v32/arch/hwregs/dma.h (renamed from include/asm-cris/arch-v32/hwregs/dma.h) | 0 |