commit 5dd372a23d12003276dddf7f9604154fd522ae73
author Wolfgang Denk <wd@denx.de> Mon Jan 14 10:48:28 2008 +0100
committer Wolfgang Denk <wd@denx.de> Mon Jan 14 10:48:28 2008 +0100
tree 2412e88bbf804e74759ef0793d67064b76b8ab1a
parent 06c428bcd4413014b43236e77765022071424fa6
parent a0dd99d51efa55fe023e19c97ead92683725eb11

Merge branch 'master' of git://www.denx.de/git/u-boot-ppc4xx

drivers/qe/qe.c

diff --git a/drivers/qe/qe.c b/drivers/qe/qe.c
index c802014..63acfa3 100644
--- a/drivers/qe/qe.c
+++ b/drivers/qe/qe.c
@@ -387,7 +387,7 @@
 	 * saved microcode information and put in the new.
 	 */
 	memset(&qe_firmware_info, 0, sizeof(qe_firmware_info));
-	strcpy(qe_firmware_info.id, firmware->id);
+	strcpy(qe_firmware_info.id, (char *)firmware->id);
 	qe_firmware_info.extended_modes = firmware->extended_modes;
 	memcpy(qe_firmware_info.vtraps, firmware->vtraps,
 		sizeof(firmware->vtraps));

drivers/qe/uec.c

diff --git a/drivers/qe/uec.c b/drivers/qe/uec.c
index 44cbea5..6cb25bf 100644
--- a/drivers/qe/uec.c
+++ b/drivers/qe/uec.c
@@ -1249,6 +1249,7 @@
 	memset(uec, 0, sizeof(uec_private_t));
 
 	/* Init UEC private struct, they come from board.h */
+	uec_info = NULL;
 	if (index == 0) {
 #ifdef CONFIG_UEC_ETH1
 		uec_info = &eth1_uec_info;