From: Minkyu Kang <mk7.kang@samsung.com>
Date: Fri, 22 Jan 2010 03:03:05 +0000 (+0900)
Subject: s5pc110: universal: kill warnings
X-Git-Tag: JA08_20100122~9
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=e9d5bef0344413734b8dd25ba1388babadc6bf0c;p=kernel%2Fu-boot.git

s5pc110: universal: kill warnings

universal.c: In function 'into_charge_mode':
universal.c:1080: warning: assignment makes integer from pointer without a cast
universal.c:1089: warning: implicit declaration of function 'free'
universal.c: In function 'max8998_power_key':
universal.c:1045: warning: control reaches end of non-void function

Signed-off-by: Minkyu Kang <mk7.kang@samsung.com>
---

diff --git a/board/samsung/universal/universal.c b/board/samsung/universal/universal.c
index 5982438..e04f7c9 100644
--- a/board/samsung/universal/universal.c
+++ b/board/samsung/universal/universal.c
@@ -24,6 +24,7 @@
 
 #include <common.h>
 #include <i2c.h>
+#include <malloc.h>
 #include <asm/io.h>
 #include <asm/arch/clk.h>
 #include <asm/arch/clock.h>
@@ -1042,7 +1043,10 @@ static int max8998_power_key(void)
 	printf("MAX8998 IRQ1 = 0x%x\n", val[0]);
 	if (val[0] & (1 << 6))
 		return 1;
+
+	return 0;
 }
+
 static void into_charge_mode(void)
 {
 	unsigned char addr = 0xCC >> 1;	/* max8998 */;
@@ -1077,7 +1081,7 @@ static void into_charge_mode(void)
 		level = CHARGER_ANIMATION_FRAME - 1;
 
 	for (i = 0; i < CHARGER_ANIMATION_FRAME; i++)
-		bmp_addr[i] = battery_charging_animation[i];
+		bmp_addr[i] = (ulong)battery_charging_animation[i];
 
 	lcd_display_clear();
 	for (i = 0; i < 3; i++) {