summaryrefslogtreecommitdiffstats
path: root/arch
diff options
context:
space:
mode:
authorBob Liu <lliubbo@gmail.com>2012-01-16 04:18:50 +0100
committerBob Liu <lliubbo@gmail.com>2012-03-21 04:00:07 +0100
commit57084ede395bb3c9da7905701d34a3b7d33c9356 (patch)
tree4c7be074abc644cdf8a99bdaf2e172c8e9389a12 /arch
parentblackfin: kgdb: skip hardware watchpoint test (diff)
downloadlinux-57084ede395bb3c9da7905701d34a3b7d33c9356.tar.xz
linux-57084ede395bb3c9da7905701d34a3b7d33c9356.zip
blackfin: bf537: stamp: update board file for 193x
Signed-off-by: Scott Jiang <scott.jiang.linux@gmail.com> Signed-off-by: Bob Liu <lliubbo@gmail.com>
Diffstat (limited to 'arch')
-rw-r--r--arch/blackfin/mach-bf537/boards/stamp.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/blackfin/mach-bf537/boards/stamp.c b/arch/blackfin/mach-bf537/boards/stamp.c
index 2221173e489e..58e17c275dc8 100644
--- a/arch/blackfin/mach-bf537/boards/stamp.c
+++ b/arch/blackfin/mach-bf537/boards/stamp.c
@@ -975,7 +975,7 @@ static struct spi_board_info bfin_spi_board_info[] __initdata = {
},
#endif
-#if defined(CONFIG_SND_BF5XX_SOC_AD193X) || defined(CONFIG_SND_BF5XX_SOC_AD193X_MODULE)
+#ifdef CONFIG_SND_SOC_AD193X_SPI
{
.modalias = "ad193x",
.max_speed_hz = 3125000, /* max spi clock (SCK) speed in HZ */
@@ -2171,7 +2171,7 @@ static unsigned long adt7316_i2c_data[2] = {
#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),
},