Title: [9628] trunk/arch/blackfin/mach-bf537/boards/stamp.c: bfin: board file for 193x update to 2.6.37
- Revision
- 9628
- Author
- scott
- Date
- 2011-02-24 01:58:33 -0500 (Thu, 24 Feb 2011)
Log Message
bfin: board file for 193x update to 2.6.37
Modified Paths
Diff
Modified: trunk/arch/blackfin/mach-bf537/boards/stamp.c (9627 => 9628)
--- trunk/arch/blackfin/mach-bf537/boards/stamp.c 2011-02-24 06:50:00 UTC (rev 9627)
+++ trunk/arch/blackfin/mach-bf537/boards/stamp.c 2011-02-24 06:58:33 UTC (rev 9628)
@@ -558,8 +558,7 @@
};
#endif
-#if defined(CONFIG_SND_BF5XX_SOC_AD193X) \
- || defined(CONFIG_SND_BF5XX_SOC_AD193X_MODULE)
+#ifdef CONFIG_SND_SOC_AD193X_SPI
static struct bfin5xx_spi_chip ad1938_spi_chip_info = {
.enable_dma = 0,
.bits_per_word = 8,
@@ -1082,9 +1081,9 @@
},
#endif
-#if defined(CONFIG_SND_BF5XX_SOC_AD193X) || defined(CONFIG_SND_BF5XX_SOC_AD193X_MODULE)
+#ifdef CONFIG_SND_SOC_AD193X_SPI
{
- .modalias = "ad193x",
+ .modalias = "ad193x-codec",
.max_speed_hz = 3125000, /* max spi clock (SCK) speed in HZ */
.bus_num = 0,
.chip_select = 5,
@@ -2214,7 +2213,7 @@
#endif
static struct i2c_board_info __initdata bfin_i2c_board_info[] = {
-#if defined(CONFIG_SND_BF5XX_SOC_AD193X) || defined(CONFIG_SND_BF5XX_SOC_AD193X_MODULE)
+#ifdef CONFIG_SND_SOC_AD193X_I2C
{
I2C_BOARD_INFO("ad1937", 0x04),
},
_______________________________________________
Linux-kernel-commits mailing list
[email protected]
https://blackfin.uclinux.org/mailman/listinfo/linux-kernel-commits
