commit 64cd52efd1dc51a4a5a0cf10efe5362fab27de29
author Stefan Roese <sr@denx.de> Mon Sep 18 10:48:03 2006 +0200
committer Stefan Roese <sr@denx.de> Mon Sep 18 10:48:03 2006 +0200
tree 64e046a7d8b2f0106bc387dd032734ad963f4e68
parent 899620c2d66d4eef3b2a0034d062e71d45d886c9
parent 854bc8da75709f13dab4cfa6e9094c0cb49b5c5a

Merge with /home/stefan/git/u-boot/denx

common/altera.c

diff --git a/common/altera.c b/common/altera.c
index 357d702..06e8a95 100644
--- a/common/altera.c
+++ b/common/altera.c
@@ -50,7 +50,7 @@
 {
 	int ret_val = FPGA_FAIL;	/* assume a failure */
 
-	if (!altera_validate (desc, __FUNCTION__)) {
+	if (!altera_validate (desc, (char *)__FUNCTION__)) {
 		printf ("%s: Invalid device descriptor\n", __FUNCTION__);
 	} else {
 		switch (desc->family) {
@@ -83,7 +83,7 @@
 {
 	int ret_val = FPGA_FAIL;	/* assume a failure */
 
-	if (!altera_validate (desc, __FUNCTION__)) {
+	if (!altera_validate (desc, (char *)__FUNCTION__)) {
 		printf ("%s: Invalid device descriptor\n", __FUNCTION__);
 	} else {
 		switch (desc->family) {
@@ -111,7 +111,7 @@
 {
 	int ret_val = FPGA_FAIL;
 
-	if (altera_validate (desc, __FUNCTION__)) {
+	if (altera_validate (desc, (char *)__FUNCTION__)) {
 		printf ("Family:        \t");
 		switch (desc->family) {
 		case Altera_ACEX1K:
@@ -187,7 +187,7 @@
 {
 	int ret_val = FPGA_FAIL;	/* assume a failure */
 
-	if (!altera_validate (desc, __FUNCTION__)) {
+	if (!altera_validate (desc, (char *)__FUNCTION__)) {
 		printf ("%s: Invalid device descriptor\n", __FUNCTION__);
 	} else {
 		switch (desc->family) {