Title: [8565] trunk/arch/blackfin/mach-bf537/boards/stamp.c: ad1937 board information: rename SND_SOC_AD193X_I2C to SND_BF5XX_SOC_AD193X
- Revision
- 8565
- Author
- bhsong
- Date
- 2010-03-29 02:37:17 -0400 (Mon, 29 Mar 2010)
Log Message
ad1937 board information: rename SND_SOC_AD193X_I2C to SND_BF5XX_SOC_AD193X
ASoC requires merging spi and i2c into one driver, then in the test, we can't enable i2c and spi at the same time.
Otherwise, two codecs will be probed.
Modified Paths
Diff
Modified: trunk/arch/blackfin/mach-bf537/boards/stamp.c (8564 => 8565)
--- trunk/arch/blackfin/mach-bf537/boards/stamp.c 2010-03-29 04:30:40 UTC (rev 8564)
+++ trunk/arch/blackfin/mach-bf537/boards/stamp.c 2010-03-29 06:37:17 UTC (rev 8565)
@@ -1835,7 +1835,7 @@
#endif
static struct i2c_board_info __initdata bfin_i2c_board_info[] = {
-#if defined(CONFIG_SND_SOC_AD193X_I2C) || defined(CONFIG_SND_SOC_AD193X_I2C_MODULE)
+#if defined(CONFIG_SND_BF5XX_SOC_AD193X) || defined(CONFIG_SND_BF5XX_SOC_AD193X_MODULE)
{
I2C_BOARD_INFO("ad1937", 0x04),
},
_______________________________________________
Linux-kernel-commits mailing list
[email protected]
https://blackfin.uclinux.org/mailman/listinfo/linux-kernel-commits
