Merge branch 'for-linus/samsung-2635' of git://git.fluff.org/bjdooks/linux

* 'for-linus/samsung-2635' of git://git.fluff.org/bjdooks/linux:
  DMAENGINE: correct PL080 register header file
  ARM: SAMSUNG: Fix on build warning about dependency in Kconfig
  ARM: SMDK6410: Make virtual screen twice depth of real
  ARM: S3C64XX: Update consistent DMA size to 8MiB
  ARM: S3C64XX: Add audio support to SmartQ
  ARM: S3C64XX: Framebuffer fix for SmartQ5
  ARM: S3C64XX: Set wifi and iNAND as permanently connected SD devices on SmartQ boards
  ARM: S3C64XX: Move SmartQ LCD control platform definition to shared file
  ARM: mach-real6410: add sdhc device support
  ARM: mach-real6410: add dm9000 ethernet support for mach-real6410
  ARM: S3C64XX: Support for Real6410

Fix up trivial conflicts in arch/arm/mach-s3c64xx/mach-smartq5.c
("remove pixclock" vs "Framebuffer fix for SmartQ5")

1 files changed, 3 insertions, 1 deletions

diff --git a/arch/arm/include/asm/hardware/pl080.h b/arch/arm/include/asm/hardware/pl080.h
index 6a6c66be7f65..f35b86e68dd5 100644
--- a/arch/arm/include/asm/hardware/pl080.h
+++ b/arch/arm/include/asm/hardware/pl080.h
@@ -43,7 +43,7 @@
 
 /* Per channel configuration registers */
 
-#define PL008_Cx_STRIDE                         (0x20)
+#define PL080_Cx_STRIDE                         (0x20)
 #define PL080_Cx_BASE(x)                        ((0x100 + (x * 0x20)))
 #define PL080_Cx_SRC_ADDR(x)                    ((0x100 + (x * 0x20)))
 #define PL080_Cx_DST_ADDR(x)                    ((0x104 + (x * 0x20)))
@@ -68,6 +68,8 @@
 #define PL080_CONTROL_TC_IRQ_EN                 (1 << 31)
 #define PL080_CONTROL_PROT_MASK                 (0x7 << 28)
 #define PL080_CONTROL_PROT_SHIFT                (28)
+#define PL080_CONTROL_PROT_CACHE                (1 << 30)
+#define PL080_CONTROL_PROT_BUFF                 (1 << 29)
 #define PL080_CONTROL_PROT_SYS                  (1 << 28)
 #define PL080_CONTROL_DST_INCR                  (1 << 27)
 #define PL080_CONTROL_SRC_INCR                  (1 << 26)