From 6909a7d200140ec01f2c322582358ec5269af0d0 Mon Sep 17 00:00:00 2001 From: Bob Liu Date: Mon, 16 Jan 2012 11:18:50 +0800 Subject: [PATCH] --- yaml --- r: 293953 b: refs/heads/master c: 57084ede395bb3c9da7905701d34a3b7d33c9356 h: refs/heads/master i: 293951: a0b6489be67839c718cfc4e88dbc13c2444a2dcd v: v3 --- [refs] | 2 +- trunk/arch/blackfin/mach-bf537/boards/stamp.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index ae743c16329b..613db087667e 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: a5b44eeb38f7f3bd07bf857a26f1ac6193512df5 +refs/heads/master: 57084ede395bb3c9da7905701d34a3b7d33c9356 diff --git a/trunk/arch/blackfin/mach-bf537/boards/stamp.c b/trunk/arch/blackfin/mach-bf537/boards/stamp.c index 2221173e489e..58e17c275dc8 100644 --- a/trunk/arch/blackfin/mach-bf537/boards/stamp.c +++ b/trunk/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), },