Error of 'handle_local_timer' missing in plat-mxc/gic.c when building 'mx5-merge' branch

[Eric Miao]

Hi Sascha,

Just FYI,

  CC      arch/arm/plat-mxc/gic.o
/home/ycmiao/linux-2.6/arch/arm/plat-mxc/gic.c: In function 'gic_handle_irq':
/home/ycmiao/linux-2.6/arch/arm/plat-mxc/gic.c:44:4: error: implicit
declaration of function 'handle_local_timer'
make[2]: *** [arch/arm/plat-mxc/gic.o] Error 1
make[1]: *** [arch/arm/plat-mxc] Error 2
make: *** [sub-make] Error 2

Do we have a fix somewhere already?

- eric