diff options
| author | Stefan Roese <sr@denx.de> | 2006-09-18 10:48:03 +0200 | 
|---|---|---|
| committer | Stefan Roese <sr@denx.de> | 2006-09-18 10:48:03 +0200 | 
| commit | 64cd52efd1dc51a4a5a0cf10efe5362fab27de29 (patch) | |
| tree | 64e046a7d8b2f0106bc387dd032734ad963f4e68 /common/fpga.c | |
| parent | 899620c2d66d4eef3b2a0034d062e71d45d886c9 (diff) | |
| parent | 854bc8da75709f13dab4cfa6e9094c0cb49b5c5a (diff) | |
| download | olio-uboot-2014.01-64cd52efd1dc51a4a5a0cf10efe5362fab27de29.tar.xz olio-uboot-2014.01-64cd52efd1dc51a4a5a0cf10efe5362fab27de29.zip | |
Merge with /home/stefan/git/u-boot/denx
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 02d3e42b3..2eff239c4 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: |