From: Arnd Bergmann <arnd@arndb.de>
Date: Mon, 12 Nov 2012 20:57:52 +0000 (+0100)
Subject: Merge branches 'depends/asoc', 'renesas/boards' and 'renesas/soc' into next/boards2
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=fd2e1dd7bb2e4f19e063aff9194b795be8510464;p=GitHub%2FLineageOS%2Fandroid_kernel_motorola_exynos9610.git

Merge branches 'depends/asoc', 'renesas/boards' and 'renesas/soc' into next/boards2

These are all dependencies for the renesas/boards2 branch.

Conflicts:
	arch/arm/configs/marzen_defconfig
---

fd2e1dd7bb2e4f19e063aff9194b795be8510464
diff --cc sound/soc/sh/fsi.c
index 9d7f30774a44,bdaca356aaad,5328ae5539f1,5328ae5539f1..4a10e4d1bd43
--- a/sound/soc/sh/fsi.c
+++ b/sound/soc/sh/fsi.c
@@@@@ -20,8 -20,8 -20,7 -20,7 +20,9 @@@@@
    #include <linux/sh_dma.h>
    #include <linux/slab.h>
    #include <linux/module.h>
 +++#include <linux/workqueue.h>
    #include <sound/soc.h>
+ ++#include <sound/pcm_params.h>
    #include <sound/sh_fsi.h>
    
    /* PortA/PortB register */