Hi Kukjin,
Today's linux-next merge of the samsung tree got a conflict in
arch/arm/mach-s3c64xx/dma.c between commit 3a95b9fbba89 ("pl080.h: moved
from arm/include/asm/hardware to include/linux/amba/") from the slave-dma
tree and commit f2bfd174bdc0 ("ARM: S3C64XX: make regs-sys.h local") from
the samsung tree.
I fixed it up (see below) and can carry the fix as necessary (no action
is required).
--
Cheers,
Stephen Rothwell sfr@xxxxxxxxxxxxxxxx
diff --cc arch/arm/mach-s3c64xx/dma.c
index a77f521,ec29b35..0000000
--- a/arch/arm/mach-s3c64xx/dma.c
+++ b/arch/arm/mach-s3c64xx/dma.c
@@@ -29,8 -28,9 +29,7 @@@
#include <mach/map.h>
#include <mach/irqs.h>
- #include <mach/regs-sys.h>
-
-#include <asm/hardware/pl080.h>
-
+ #include "regs-sys.h"
/* dma channel state information */
Attachment:
pgpi0j5hOTEuG.pgp
Description: PGP signature
