diff options
| author | Wolfgang Denk <wd@pollux.denx.de> | 2006-11-27 23:11:18 +0100 |
|---|---|---|
| committer | Wolfgang Denk <wd@denx.de> | 2006-11-27 23:11:18 +0100 |
| commit | d2c83f549378fb3fc34cb3c2e62fd772fbf8b68b (patch) | |
| tree | f00383ed01ca18fa0beee4930ebb7f3dc4153e5e /common/fpga.c | |
| parent | 4f4b602ec7524a032bdf3c6d28c7f525a4a67eaa (diff) | |
| parent | 1729b92cde575476684bffe819d0b7791b57bff2 (diff) | |
| download | u-boot-imx-d2c83f549378fb3fc34cb3c2e62fd772fbf8b68b.zip u-boot-imx-d2c83f549378fb3fc34cb3c2e62fd772fbf8b68b.tar.gz u-boot-imx-d2c83f549378fb3fc34cb3c2e62fd772fbf8b68b.tar.bz2 | |
Merge with /home/sr/git/u-boot/denx-alpr-merge-test
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: |