Merge remote-tracking branch 'u-boot/master' into test

[karo-tx-uboot.git] / board / spear / x600 / fpga.c

diff --git a/board/spear/x600/fpga.c b/board/spear/x600/fpga.c
index c06c994777776cab3e5756a5348630ab0ea7a112..b256222e186487515537d9d60dd85a66c44f300b 100644 (file)
--- a/board/spear/x600/fpga.c
+++ b/board/spear/x600/fpga.c
@@ -163,7 +163,7 @@ static int fpga_wr_fn(int assert_write, int flush, int cookie)
        return assert_write;
 }
 
-static Xilinx_Spartan3_Slave_Serial_fns x600_fpga_fns = {
+static xilinx_spartan3_slave_serial_fns x600_fpga_fns = {
        fpga_pre_config_fn,
        fpga_pgm_fn,
        fpga_clk_fn,
@@ -173,7 +173,7 @@ static Xilinx_Spartan3_Slave_Serial_fns x600_fpga_fns = {
        fpga_post_config_fn,
 };
 
-static Xilinx_desc fpga[CONFIG_FPGA_COUNT] = {
+static xilinx_desc fpga[CONFIG_FPGA_COUNT] = {
        XILINX_XC3S1200E_DESC(slave_serial, &x600_fpga_fns, 0)
 };