From: Scott Jiang Date: Thu, 21 Jun 2012 20:50:58 +0000 (-0400) Subject: bf609: reuse bf5xx-i2s-pcm.c as i2s pcm driver X-Git-Tag: Ubuntu-snapdragon-4.4.0-1029.32~12824^2~14 X-Git-Url: https://git.proxmox.com/?a=commitdiff_plain;h=2984b52b07ce45495700ce82f085800431b79cdc;p=mirror_ubuntu-zesty-kernel.git bf609: reuse bf5xx-i2s-pcm.c as i2s pcm driver It's the same for both bf5xx and bf6xx soc. Signed-off-by: Scott Jiang Signed-off-by: Bob Liu --- diff --git a/arch/blackfin/mach-bf609/boards/ezkit.c b/arch/blackfin/mach-bf609/boards/ezkit.c index a4ef400945ca..ff2bc19975f1 100644 --- a/arch/blackfin/mach-bf609/boards/ezkit.c +++ b/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) || \