diff options
| author | roy zang <tie-fei.zang@freescale.com> | 2006-11-29 09:45:03 +0800 |
|---|---|---|
| committer | Zang Tiefei <roy@bus.ap.freescale.net> | 2006-11-29 09:45:03 +0800 |
| commit | 6bd87c0aeea441c49d59fd542b84a9be88d08b17 (patch) | |
| tree | e450a5f1e69a78a203a1e15167d7fefa43c5ce7e /common/fpga.c | |
| parent | 0a8eb59983047ae3bcc0babf3ee4d10d01abe7da (diff) | |
| parent | d2c83f549378fb3fc34cb3c2e62fd772fbf8b68b (diff) | |
| download | u-boot-imx-6bd87c0aeea441c49d59fd542b84a9be88d08b17.zip u-boot-imx-6bd87c0aeea441c49d59fd542b84a9be88d08b17.tar.gz u-boot-imx-6bd87c0aeea441c49d59fd542b84a9be88d08b17.tar.bz2 | |
Solve the copyright conflicts when merging 'master' into hpc2.
Merge branch 'master' into hpc2
Conflicts:
drivers/cfi_flash.c
Diffstat (limited to 'common/fpga.c')
| -rw-r--r-- | common/fpga.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/common/fpga.c b/common/fpga.c index 02d3e42..2eff239 100644 --- a/common/fpga.c +++ b/common/fpga.c @@ -139,7 +139,7 @@ static int fpga_dev_info( int devnum ) printf( "Xilinx Device\nDescriptor @ 0x%p\n", desc ); ret_val = xilinx_info( desc->devdesc ); #else - fpga_no_sup( __FUNCTION__, "Xilinx devices" ); + fpga_no_sup( (char *)__FUNCTION__, "Xilinx devices" ); #endif break; case fpga_altera: @@ -178,7 +178,7 @@ int fpga_reloc( fpga_type devtype, void *desc, ulong reloc_off ) #if CONFIG_FPGA & CFG_FPGA_XILINX ret_val = xilinx_reloc( desc, reloc_off ); #else - fpga_no_sup( __FUNCTION__, "Xilinx devices" ); + fpga_no_sup( (char *)__FUNCTION__, "Xilinx devices" ); #endif break; case fpga_altera: @@ -271,7 +271,7 @@ int fpga_load( int devnum, void *buf, size_t bsize ) #if CONFIG_FPGA & CFG_FPGA_XILINX ret_val = xilinx_load( desc->devdesc, buf, bsize ); #else - fpga_no_sup( __FUNCTION__, "Xilinx devices" ); + fpga_no_sup( (char *)__FUNCTION__, "Xilinx devices" ); #endif break; case fpga_altera: @@ -304,7 +304,7 @@ int fpga_dump( int devnum, void *buf, size_t bsize ) #if CONFIG_FPGA & CFG_FPGA_XILINX ret_val = xilinx_dump( desc->devdesc, buf, bsize ); #else - fpga_no_sup( __FUNCTION__, "Xilinx devices" ); + fpga_no_sup( (char *)__FUNCTION__, "Xilinx devices" ); #endif break; case fpga_altera: |