diff options
Diffstat (limited to 'arch/blackfin/mach-bf537/boards/stamp.c')
| -rw-r--r-- | arch/blackfin/mach-bf537/boards/stamp.c | 9 | 
1 files changed, 2 insertions, 7 deletions
| diff --git a/arch/blackfin/mach-bf537/boards/stamp.c b/arch/blackfin/mach-bf537/boards/stamp.c index 9a756d1f3d73..671f9d67f23a 100644 --- a/arch/blackfin/mach-bf537/boards/stamp.c +++ b/arch/blackfin/mach-bf537/boards/stamp.c @@ -400,9 +400,6 @@ static struct platform_device stamp_flash_device = {  };  #endif -#if defined(CONFIG_SPI_BFIN) || defined(CONFIG_SPI_BFIN_MODULE) -/* all SPI peripherals info goes here */ -  #if defined(CONFIG_MTD_M25P80) \  	|| defined(CONFIG_MTD_M25P80_MODULE)  static struct mtd_partition bfin_spi_flash_partitions[] = { @@ -629,6 +626,7 @@ static struct spi_board_info bfin_spi_board_info[] __initdata = {  #endif  }; +#if defined(CONFIG_SPI_BFIN) || defined(CONFIG_SPI_BFIN_MODULE)  /* SPI controller data */  static struct bfin5xx_spi_master bfin_spi0_info = {  	.num_chipselect = 8, @@ -939,10 +937,7 @@ static int __init stamp_init(void)  #endif  	platform_add_devices(stamp_devices, ARRAY_SIZE(stamp_devices)); -#if defined(CONFIG_SPI_BFIN) || defined(CONFIG_SPI_BFIN_MODULE) -	spi_register_board_info(bfin_spi_board_info, -				ARRAY_SIZE(bfin_spi_board_info)); -#endif +	spi_register_board_info(bfin_spi_board_info, ARRAY_SIZE(bfin_spi_board_info));  #if defined(CONFIG_PATA_PLATFORM) || defined(CONFIG_PATA_PLATFORM_MODULE)  	irq_desc[PATA_INT].status |= IRQ_NOAUTOEN; | 
