[ARM] Merge remaining IOP code
Conflicts:
include/asm-arm/arch-at91rm9200/entry-macro.S
Signed-off-by: 
Russell King <rmk+kernel@arm.linux.org.uk>
No related branches found
No related tags found
Showing
- arch/arm/kernel/entry-armv.S 1 addition, 0 deletionsarch/arm/kernel/entry-armv.S
- arch/arm/kernel/entry-common.S 7 additions, 0 deletionsarch/arm/kernel/entry-common.S
- arch/arm/mach-iop13xx/Makefile 0 additions, 1 deletionarch/arm/mach-iop13xx/Makefile
- arch/arm/mach-iop13xx/iq81340mc.c 3 additions, 2 deletionsarch/arm/mach-iop13xx/iq81340mc.c
- arch/arm/mach-iop13xx/iq81340sc.c 3 additions, 2 deletionsarch/arm/mach-iop13xx/iq81340sc.c
- arch/arm/mach-iop13xx/irq.c 0 additions, 19 deletionsarch/arm/mach-iop13xx/irq.c
- arch/arm/mach-iop13xx/time.c 0 additions, 102 deletionsarch/arm/mach-iop13xx/time.c
- arch/arm/mach-iop32x/glantank.c 3 additions, 2 deletionsarch/arm/mach-iop32x/glantank.c
- arch/arm/mach-iop32x/iq31244.c 4 additions, 4 deletionsarch/arm/mach-iop32x/iq31244.c
- arch/arm/mach-iop32x/iq80321.c 3 additions, 2 deletionsarch/arm/mach-iop32x/iq80321.c
- arch/arm/mach-iop32x/irq.c 0 additions, 4 deletionsarch/arm/mach-iop32x/irq.c
- arch/arm/mach-iop32x/n2100.c 3 additions, 2 deletionsarch/arm/mach-iop32x/n2100.c
- arch/arm/mach-iop33x/iq80331.c 4 additions, 3 deletionsarch/arm/mach-iop33x/iq80331.c
- arch/arm/mach-iop33x/iq80332.c 4 additions, 3 deletionsarch/arm/mach-iop33x/iq80332.c
- arch/arm/mach-iop33x/irq.c 0 additions, 12 deletionsarch/arm/mach-iop33x/irq.c
- arch/arm/plat-iop/Makefile 1 addition, 0 deletionsarch/arm/plat-iop/Makefile
- arch/arm/plat-iop/time.c 35 additions, 31 deletionsarch/arm/plat-iop/time.c
- include/asm-arm/arch-aaec2000/entry-macro.S 6 additions, 0 deletionsinclude/asm-arm/arch-aaec2000/entry-macro.S
- include/asm-arm/arch-at91/entry-macro.S 6 additions, 0 deletionsinclude/asm-arm/arch-at91/entry-macro.S
- include/asm-arm/arch-at91rm9200/entry-macro.S 32 additions, 0 deletionsinclude/asm-arm/arch-at91rm9200/entry-macro.S
Loading
Please register or sign in to comment