From: Greg Kroah-Hartman Date: Fri, 8 May 2015 20:40:47 +0000 (+0200) Subject: greybus: gb-audio: fix build breakage on 4.1-rc1 X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=61c0926eec4153e51f047fbf91b897abeca4cccb;p=GitHub%2FLineageOS%2Fandroid_kernel_motorola_exynos9610.git greybus: gb-audio: fix build breakage on 4.1-rc1 In commit 1efb53a220b7 ("ASoC: simple-card: Remove support for setting differing DAI formats"), the .fmt field was removed from struct asoc_simple_dai. Fix this build breakage by not trying to set it. Signed-off-by: Greg Kroah-Hartman Acked-by: John Stultz --- diff --git a/drivers/staging/greybus/audio.c b/drivers/staging/greybus/audio.c index 29f5d4bc2fd2..1ef09035706f 100644 --- a/drivers/staging/greybus/audio.c +++ b/drivers/staging/greybus/audio.c @@ -106,7 +106,9 @@ struct asoc_simple_card_info *setup_card_info(int device_count) obj->card_info.codec = obj->codec_name; obj->card_info.platform = obj->platform_name; obj->card_info.cpu_dai.name = obj->dai_name; +#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 1, 0) obj->card_info.cpu_dai.fmt = GB_FMTS; +#endif #if USE_RT5645 obj->card_info.daifmt = GB_FMTS; sprintf(obj->codec_name, "rt5645.%s", "6-001b"); /* XXX do i2c bus addr dynamically */