del rk29 gic and timer warning

diff --git a/arch/arm/mach-rk29/board-rk29sdk.c b/arch/arm/mach-rk29/board-rk29sdk.c
index 26a360585888036fb8f56374dda268b3c8bddb21..231e1327e1a169c353b58887fdf656d13a9bc3d6 100644 (file)
--- a/arch/arm/mach-rk29/board-rk29sdk.c
+++ b/arch/arm/mach-rk29/board-rk29sdk.c
@@ -42,8 +42,8 @@ extern struct sys_timer rk29_timer;
 \r
 static void __init rk29_gic_init_irq(void)\r
 {\r
-       gic_dist_init(0, RK29_GICPERI_BASE, 32);\r
-       gic_cpu_init(0, RK29_GICCPU_BASE);\r
+       gic_dist_init(0, (void __iomem *)RK29_GICPERI_BASE, 32);\r
+       gic_cpu_init(0, (void __iomem *)RK29_GICCPU_BASE);\r
 }\r
 \r
 static void __init machine_rk29_init_irq(void)\r
@@ -53,7 +53,7 @@ static void __init machine_rk29_init_irq(void)
        //rk29_gpio_irq_setup();\r
 }\r
 static void __init machine_rk29_board_init(void)\r
-{\r
+{ \r
        \r
 }\r
 \r

diff --git a/arch/arm/mach-rk29/timer.c b/arch/arm/mach-rk29/timer.c
index 70569978f8165a5dc884f56a3743cf5202b9f11c..4826186b82e465d9e319743b08d6562c4f904a62 100644 (file)
--- a/arch/arm/mach-rk29/timer.c
+++ b/arch/arm/mach-rk29/timer.c
@@ -55,7 +55,7 @@
 #define IRQ_NR_TIMER_CLKSRC            IRQ_TIMER1
 #define TIMER_CLKSRC_NAME              "timer1"
 
-static struct clk *timer_clk;
+//static struct clk *timer_clk;
 static volatile unsigned long timer_mult; /* timer count = cycle * timer_mult */
 
 void rk29_timer_update_mult(void)