From 203799d5c38722992032cc83922875e320fba870 Mon Sep 17 00:00:00 2001 From: Scott Jiang Date: Thu, 21 Jun 2012 16:50:58 -0400 Subject: [PATCH] --- yaml --- r: 313834 b: refs/heads/master c: 2984b52b07ce45495700ce82f085800431b79cdc h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/arch/blackfin/mach-bf609/boards/ezkit.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index f1bd4c403d6e..30a71551acc5 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: c38670bc5d1be870717f694a5d6dc2961c37d979 +refs/heads/master: 2984b52b07ce45495700ce82f085800431b79cdc diff --git a/trunk/arch/blackfin/mach-bf609/boards/ezkit.c b/trunk/arch/blackfin/mach-bf609/boards/ezkit.c index a4ef400945ca..ff2bc19975f1 100644 --- a/trunk/arch/blackfin/mach-bf609/boards/ezkit.c +++ b/trunk/arch/blackfin/mach-bf609/boards/ezkit.c @@ -742,7 +742,7 @@ static struct bfin6xx_spi_chip spidev_chip_info = { }; #endif -#if defined(CONFIG_SND_BF6XX_I2S) || defined(CONFIG_SND_BF6XX_I2S_MODULE) +#if defined(CONFIG_SND_BF5XX_I2S) || defined(CONFIG_SND_BF5XX_I2S_MODULE) static struct platform_device bfin_i2s_pcm = { .name = "bfin-i2s-pcm-audio", .id = -1, @@ -1460,7 +1460,7 @@ static struct platform_device *ezkit_devices[] __initdata = { #if defined(CONFIG_MTD_PHYSMAP) || defined(CONFIG_MTD_PHYSMAP_MODULE) &ezkit_flash_device, #endif -#if defined(CONFIG_SND_BF6XX_I2S) || defined(CONFIG_SND_BF6XX_I2S_MODULE) +#if defined(CONFIG_SND_BF5XX_I2S) || defined(CONFIG_SND_BF5XX_I2S_MODULE) &bfin_i2s_pcm, #endif #if defined(CONFIG_SND_BF6XX_SOC_I2S) || \