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")

diff --cc arch/arm/mach-s3c64xx/Kconfig
Simple merge

diff --cc arch/arm/mach-s3c64xx/Makefile
Simple merge

diff --cc arch/arm/mach-s3c64xx/mach-smartq5.c
index a065062,70bcbca..a4d59b0
--- 1/arch/arm/mach-s3c64xx/mach-smartq5.c
--- 2/arch/arm/mach-s3c64xx/mach-smartq5.c
+++ b/arch/arm/mach-s3c64xx/mach-smartq5.c
@@@ -134,10 -108,12 +108,10 @@@ static struct platform_device smartq5_b
  
  static struct s3c_fb_pd_win smartq5_fb_win0 = {
        .win_mode       = {
-               .left_margin    = 40,
-               .right_margin   = 216,
-               .upper_margin   = 10,
-               .lower_margin   = 35,
 -              .pixclock       = 1000000000000ULL /
 -                              ((40+1+216+800)*(10+1+35+480)*80),
+               .left_margin    = 216,
+               .right_margin   = 40,
+               .upper_margin   = 35,
+               .lower_margin   = 10,
                .hsync_len      = 1,
                .vsync_len      = 1,
                .xres           = 800,

diff --cc arch/arm/mach-s3c64xx/mach-smartq7.c
Simple merge

diff --cc arch/arm/mach-s3c64xx/mach-smdk6410.c
Simple merge

diff --cc arch/arm/plat-samsung/Kconfig
Simple merge