a22:fix buiding error

diff --git a/arch/arm/configs/rk29_a22_defconfig b/arch/arm/configs/rk29_a22_defconfig
index f2c1803f802ce752866fff6464a81c29246fcf76..3e235b9e99c2670b305dd70385e8fb88db22d48e 100755 (executable)
--- a/arch/arm/configs/rk29_a22_defconfig
+++ b/arch/arm/configs/rk29_a22_defconfig
@@ -289,6 +289,9 @@ CONFIG_LCD_NT35510=y
 CONFIG_LOGO=y
 # CONFIG_LOGO_LINUX_MONO is not set
 # CONFIG_LOGO_LINUX_VGA16 is not set
+# CONFIG_LOGO_LINUX_CLUT224 is not set
+CONFIG_LOGO_CHARGER_CLUT224=y
+CONFIG_LOGO_G3_CLUT224=y
 CONFIG_SOUND=y
 CONFIG_SND=y
 # CONFIG_SND_SUPPORT_OLD_API is not set

diff --git a/drivers/power/wm831x_power.c b/drivers/power/wm831x_power.c
index 263ad8bcad1697ff41d389f5a1f4c852c65f163f..3ee30132f446813a56a5de1f5630c26cda3191c2 100755 (executable)
--- a/drivers/power/wm831x_power.c
+++ b/drivers/power/wm831x_power.c
@@ -1130,6 +1130,7 @@ static __devinit int wm831x_power_probe(struct platform_device *pdev)
        }
 
 #ifdef CONFIG_WM831X_WITH_BATTERY
+       int i;
        for (i = 0; i < ARRAY_SIZE(wm831x_bat_irqs); i++) {
                irq = platform_get_irq_byname(pdev, wm831x_bat_irqs[i]);
                ret = request_threaded_irq(irq, NULL, wm831x_bat_irq,
@@ -1197,6 +1198,7 @@ static __devexit int wm831x_power_remove(struct platform_device *pdev)
        struct wm831x_power *wm831x_power = platform_get_drvdata(pdev);
        int irq;
 #ifdef CONFIG_WM831X_WITH_BATTERY
+       int i;
        for (i = 0; i < ARRAY_SIZE(wm831x_bat_irqs); i++) {
                irq = platform_get_irq_byname(pdev, wm831x_bat_irqs[i]);
                free_irq(irq, wm831x_power);