Merge branch 'master' of ssh://gemini/home/wd/git/u-boot/master
diff --git a/drivers/mtd/cfi_flash.c b/drivers/mtd/cfi_flash.c
index bdfad98..04a9a92 100644
--- a/drivers/mtd/cfi_flash.c
+++ b/drivers/mtd/cfi_flash.c
@@ -349,7 +349,7 @@
 	int i;
 	char *cp;
 
-	cp = (unsigned char *) &data;
+	cp = (char *) &data;
 	for (i = 0; i < 8; i++)
 		sprintf (&str[i * 2], "%2.2x", *cp++);
 }