--- zzzz-none-000/linux-2.6.19.2/arch/mips/momentum/ocelot_g/setup.c	2007-01-10 19:10:37.000000000 +0000
+++ davinci-8020-5505/linux-2.6.19.2/arch/mips/momentum/ocelot_g/setup.c	2007-01-11 07:38:19.000000000 +0000
@@ -57,7 +57,6 @@
 #include <asm/gt64240.h>
 #include <asm/irq.h>
 #include <asm/pci.h>
-#include <asm/pgtable.h>
 #include <asm/processor.h>
 #include <asm/reboot.h>
 #include <linux/bootmem.h>
@@ -161,10 +160,6 @@
 	printk("Done\n");
 }
 
-void __init plat_timer_setup(struct irqaction *irq)
-{
-}
-
 void __init plat_mem_setup(void)
 {
 	void (*l3func)(unsigned long) = (void *) KSEG1ADDR(setup_l3cache);