From: Scott Jiang Date: Tue, 16 Aug 2011 23:08:42 +0000 (-0400) Subject: Blackfin: bf537-stamp: fix ad73311 codec config macro X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=e0754d83ed5bfd9b1353f293964889252da682f2;p=GitHub%2Fexynos8895%2Fandroid_kernel_samsung_universal8895.git Blackfin: bf537-stamp: fix ad73311 codec config macro SND_BF5XX_SOC is for machine drivers while SND_SOC is for codec drivers. Signed-off-by: Scott Jiang Signed-off-by: Mike Frysinger --- diff --git a/arch/blackfin/mach-bf537/boards/stamp.c b/arch/blackfin/mach-bf537/boards/stamp.c index 748b0f06cd91..090a880927bf 100644 --- a/arch/blackfin/mach-bf537/boards/stamp.c +++ b/arch/blackfin/mach-bf537/boards/stamp.c @@ -2540,7 +2540,7 @@ static struct platform_device bfin_ac97_pcm = { }; #endif -#if defined(CONFIG_SND_BF5XX_SOC_AD73311) || defined(CONFIG_SND_BF5XX_SOC_AD73311_MODULE) +#if defined(CONFIG_SND_SOC_AD73311) || defined(CONFIG_SND_SOC_AD73311_MODULE) static struct platform_device bfin_ad73311_codec_device = { .name = "ad73311", .id = -1, @@ -2782,7 +2782,7 @@ static struct platform_device *stamp_devices[] __initdata = { &bfin_ac97_pcm, #endif -#if defined(CONFIG_SND_BF5XX_SOC_AD73311) || defined(CONFIG_SND_BF5XX_SOC_AD73311_MODULE) +#if defined(CONFIG_SND_SOC_AD73311) || defined(CONFIG_SND_SOC_AD73311_MODULE) &bfin_ad73311_codec_device, #endif