]> rtime.felk.cvut.cz Git - zynq/linux.git/commitdiff
Xilinx: ARM: BSP: Fix compile problem for ZC770/XM010 support
authorJohn Linn <john.linn@xilinx.com>
Fri, 11 Nov 2011 16:52:07 +0000 (08:52 -0800)
committerJohn Linn <john.linn@xilinx.com>
Fri, 11 Nov 2011 16:52:07 +0000 (08:52 -0800)
Without SPI_DEV or M25P80 support the board support file would
not build. Added more conditional compilation to help it.

arch/arm/mach-zynq/board_zc770_xm010.c

index debef0087d5d71732836086edf6b591bd5b31ffb..e2de869dee9f7d9719d97ba25f49d4af908d1fba 100644 (file)
@@ -122,6 +122,8 @@ static struct flash_platform_data qspi_flash_pdata = {
 
 #endif
 
+#if defined(CONFIG_SPI_SPIDEV) || defined(CONFIG_MTD_M25P80)
+
 static struct spi_board_info __initdata xilinx_spipss_0_boardinfo[] = {
        {
 #ifdef CONFIG_SPI_SPIDEV
@@ -152,6 +154,8 @@ static struct spi_board_info __initdata xilinx_spipss_0_boardinfo[] = {
        
 };
 
+#endif
+
 extern struct sys_timer xttcpss_sys_timer;
 
 static void __init board_zc770_xm010_init(void)
@@ -162,8 +166,10 @@ static void __init board_zc770_xm010_init(void)
         */
        xilinx_init_machine();
 
+#if    defined(CONFIG_SPI_SPIDEV) || defined(CONFIG_MTD_M25P80)
        spi_register_board_info(&xilinx_spipss_0_boardinfo[0], 
                ARRAY_SIZE(xilinx_spipss_0_boardinfo));
+#endif
 }
 
 static const char *xilinx_dt_match[] = {