lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 's3c-move' into devel

Browse Source 
Conflicts:

	arch/arm/mach-versatile/core.c
This commit is contained in:
Russell King
2008-10-14 22:24:51 +01:00
committed by Russell King
parent b6825d2df5 d5120ae72a
commit 7e69a8c4d0
413 changed files with 3568 additions and 2366 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
arch/arm/plat-s3c24xx/dma.c
View File

@@ -36,7 +36,7 @@
#include <asm/mach/dma.h>
#include <mach/map.h>
#include <asm/plat-s3c24xx/dma.h>
#include <plat/dma.h>
/* io map for dma */
static void __iomem *dma_base;