5 files changed, 7 insertions, 7 deletions

diff --git a/arch/blackfin/mach-bf527/boards/ezkit.c b/arch/blackfin/mach-bf527/boards/ezkit.c
index c6614e52ad12..003e2ac654d8 100644
--- a/arch/blackfin/mach-bf527/boards/ezkit.c
+++ b/arch/blackfin/mach-bf527/boards/ezkit.c
@@ -451,7 +451,7 @@ static const struct ad7877_platform_data bfin_ad7877_ts_info = {
 };
 #endif
 
-#if defined(CONFIG_SND_SOC_WM8731) || defined(CONFIG_TOUCHSCREEN_AD7877_MODULE) \
+#if defined(CONFIG_SND_SOC_WM8731) || defined(CONFIG_SND_SOC_WM8731_MODULE) \
          && defined(CONFIG_SND_SOC_WM8731_SPI)
 static struct bfin5xx_spi_chip spi_wm8731_chip_info = {
         .enable_dma = 0,
@@ -564,7 +564,7 @@ static struct spi_board_info bfin_spi_board_info[] __initdata = {
                 .controller_data = &spi_ad7877_chip_info,
         },
 #endif
-#if defined(CONFIG_SND_SOC_WM8731) || defined(CONFIG_TOUCHSCREEN_AD7877_MODULE) \
+#if defined(CONFIG_SND_SOC_WM8731) || defined(CONFIG_SND_SOC_WM8731_MODULE) \
          && defined(CONFIG_SND_SOC_WM8731_SPI)
         {
                 .modalias       = "wm8731",
diff --git a/arch/blackfin/mach-bf537/boards/generic_board.c b/arch/blackfin/mach-bf537/boards/generic_board.c
index 0a1bdeb0ca94..09f4bfbd2350 100644
--- a/arch/blackfin/mach-bf537/boards/generic_board.c
+++ b/arch/blackfin/mach-bf537/boards/generic_board.c
@@ -503,7 +503,7 @@ static struct spi_board_info bfin_spi_board_info[] __initdata = {
                 .platform_data          = &bfin_ad7877_ts_info,
                 .irq                    = IRQ_PF6,
                 .max_speed_hz   = 12500000,     /* max spi clock (SCK) speed in HZ */
-                .bus_num        = 1,
+                .bus_num        = 0,
                 .chip_select  = 1,
                 .controller_data = &spi_ad7877_chip_info,
         },
diff --git a/arch/blackfin/mach-bf537/boards/pnav10.c b/arch/blackfin/mach-bf537/boards/pnav10.c
index 5826c6279fb8..fd5f4a6f08e4 100644
--- a/arch/blackfin/mach-bf537/boards/pnav10.c
+++ b/arch/blackfin/mach-bf537/boards/pnav10.c
@@ -296,7 +296,7 @@ static struct bfin5xx_spi_chip spi_mmc_chip_info = {
 
 #if defined(CONFIG_TOUCHSCREEN_AD7877) || defined(CONFIG_TOUCHSCREEN_AD7877_MODULE)
 static struct bfin5xx_spi_chip spi_ad7877_chip_info = {
-        .cs_change_per_word = 1,
+        .cs_change_per_word = 0,
         .enable_dma = 0,
         .bits_per_word = 16,
 };
@@ -388,7 +388,7 @@ static struct spi_board_info bfin_spi_board_info[] __initdata = {
         .platform_data          = &bfin_ad7877_ts_info,
         .irq                    = IRQ_PF2,
         .max_speed_hz           = 12500000,     /* max spi clock (SCK) speed in HZ */
-        .bus_num                = 1,
+        .bus_num                = 0,
         .chip_select            = 5,
         .controller_data = &spi_ad7877_chip_info,
 },
diff --git a/arch/blackfin/mach-bf537/boards/stamp.c b/arch/blackfin/mach-bf537/boards/stamp.c
index a2249dc4f263..c5ff1908d276 100644
--- a/arch/blackfin/mach-bf537/boards/stamp.c
+++ b/arch/blackfin/mach-bf537/boards/stamp.c
@@ -503,7 +503,7 @@ static struct spi_board_info bfin_spi_board_info[] __initdata = {
                 .platform_data          = &bfin_ad7877_ts_info,
                 .irq                    = IRQ_PF6,
                 .max_speed_hz   = 12500000,     /* max spi clock (SCK) speed in HZ */
-                .bus_num        = 1,
+                .bus_num        = 0,
                 .chip_select  = 1,
                 .controller_data = &spi_ad7877_chip_info,
         },
diff --git a/arch/blackfin/mach-bf548/boards/ezkit.c b/arch/blackfin/mach-bf548/boards/ezkit.c
index 2d30906626f9..bbd2a046d7c1 100644
--- a/arch/blackfin/mach-bf548/boards/ezkit.c
+++ b/arch/blackfin/mach-bf548/boards/ezkit.c
@@ -378,7 +378,7 @@ static struct bfin5xx_spi_chip spi_flash_chip_info = {
 
 #if defined(CONFIG_TOUCHSCREEN_AD7877) || defined(CONFIG_TOUCHSCREEN_AD7877_MODULE)
 static struct bfin5xx_spi_chip spi_ad7877_chip_info = {
-        .cs_change_per_word = 1,
+        .cs_change_per_word = 0,
         .enable_dma = 0,
         .bits_per_word = 16,
 };