ARM: Merge for-2635/s5p-dma
Merge branch 'for-2635/s5p-dma' into for-linus/samsung2 Conflicts: arch/arm/mach-s5pv210/Makefile
No related branches found
No related tags found
Showing
- arch/arm/mach-s5p6440/Kconfig 1 addition, 0 deletionsarch/arm/mach-s5p6440/Kconfig
- arch/arm/mach-s5p6440/Makefile 1 addition, 1 deletionarch/arm/mach-s5p6440/Makefile
- arch/arm/mach-s5p6440/dma.c 105 additions, 0 deletionsarch/arm/mach-s5p6440/dma.c
- arch/arm/mach-s5p6440/include/mach/dma.h 26 additions, 0 deletionsarch/arm/mach-s5p6440/include/mach/dma.h
- arch/arm/mach-s5p6440/include/mach/map.h 2 additions, 0 deletionsarch/arm/mach-s5p6440/include/mach/map.h
- arch/arm/mach-s5p6442/Kconfig 1 addition, 0 deletionsarch/arm/mach-s5p6442/Kconfig
- arch/arm/mach-s5p6442/Makefile 1 addition, 1 deletionarch/arm/mach-s5p6442/Makefile
- arch/arm/mach-s5p6442/dma.c 105 additions, 0 deletionsarch/arm/mach-s5p6442/dma.c
- arch/arm/mach-s5p6442/include/mach/dma.h 26 additions, 0 deletionsarch/arm/mach-s5p6442/include/mach/dma.h
- arch/arm/mach-s5p6442/include/mach/map.h 3 additions, 0 deletionsarch/arm/mach-s5p6442/include/mach/map.h
- arch/arm/mach-s5pv210/Kconfig 1 addition, 0 deletionsarch/arm/mach-s5pv210/Kconfig
- arch/arm/mach-s5pv210/Makefile 1 addition, 1 deletionarch/arm/mach-s5pv210/Makefile
- arch/arm/mach-s5pv210/dma.c 168 additions, 0 deletionsarch/arm/mach-s5pv210/dma.c
- arch/arm/mach-s5pv210/include/mach/dma.h 26 additions, 0 deletionsarch/arm/mach-s5pv210/include/mach/dma.h
- arch/arm/mach-s5pv210/include/mach/map.h 4 additions, 0 deletionsarch/arm/mach-s5pv210/include/mach/map.h
- arch/arm/plat-samsung/Kconfig 6 additions, 0 deletionsarch/arm/plat-samsung/Kconfig
- arch/arm/plat-samsung/Makefile 2 additions, 0 deletionsarch/arm/plat-samsung/Makefile
- arch/arm/plat-samsung/include/plat/s3c-dma-pl330.h 78 additions, 0 deletionsarch/arm/plat-samsung/include/plat/s3c-dma-pl330.h
- arch/arm/plat-samsung/include/plat/s3c-pl330-pdata.h 32 additions, 0 deletionsarch/arm/plat-samsung/include/plat/s3c-pl330-pdata.h
- arch/arm/plat-samsung/s3c-pl330.c 1224 additions, 0 deletionsarch/arm/plat-samsung/s3c-pl330.c
Loading
Please register or sign in to comment