From: Mark A. Greer Date: Thu, 21 May 2015 22:56:58 +0000 (-0700) Subject: greybus: gb-audio: cpu_dai.fmt does not exist in v4.1 X-Git-Tag: v4.9-rc1~119^2~378^2~21^2~1521^2~19 X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=827e27e8fe3cf1ce29343ed87e042075194ac6ca;p=karo-tx-linux.git greybus: gb-audio: cpu_dai.fmt does not exist in v4.1 The asoc_simple_dai structure does not contain the 'fmt' member in Linux kernel version v4.1 and later so only build code that uses it when the kernel version is earlier than v4.1. Signed-off-by: Mark A. Greer Acked-by: John Stultz Signed-off-by: Greg Kroah-Hartman --- diff --git a/drivers/staging/greybus/audio.c b/drivers/staging/greybus/audio.c index 03196a044694..d4d1eff2d099 100644 --- a/drivers/staging/greybus/audio.c +++ b/drivers/staging/greybus/audio.c @@ -118,7 +118,9 @@ static struct asoc_simple_card_info *setup_card_info(int device_count) sprintf(obj->codec_name, "rt5645.%d-%04x", RT5647_I2C_ADAPTER_NR, RT5647_I2C_ADDR); obj->card_info.codec_dai.name = "rt5645-aif1"; +#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 1, 0) obj->card_info.codec_dai.fmt = SND_SOC_DAIFMT_CBS_CFS; +#endif obj->card_info.codec_dai.sysclk = 12288000; #else sprintf(obj->codec_name, "spdif-dit");