summaryrefslogtreecommitdiffstats
path: root/arch/mips/momentum/ocelot_g/setup.c
diff options
context:
space:
mode:
authorDavid Woodhouse <dwmw2@infradead.org>2006-12-01 10:56:43 +0100
committerDavid Woodhouse <dwmw2@infradead.org>2006-12-01 10:56:43 +0100
commitbd3c97a7c718bfb9f1e4f31c16c383a5c6f815eb (patch)
tree3f56594e813c6f35cbacbdb3e137ba5bfd0b3069 /arch/mips/momentum/ocelot_g/setup.c
parent[MTD] bugfix: DataFlash is not bit writable (diff)
parentLinux 2.6.19 (diff)
downloadlinux-bd3c97a7c718bfb9f1e4f31c16c383a5c6f815eb.tar.xz
linux-bd3c97a7c718bfb9f1e4f31c16c383a5c6f815eb.zip
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
Diffstat (limited to 'arch/mips/momentum/ocelot_g/setup.c')
-rw-r--r--arch/mips/momentum/ocelot_g/setup.c5
1 files changed, 5 insertions, 0 deletions
diff --git a/arch/mips/momentum/ocelot_g/setup.c b/arch/mips/momentum/ocelot_g/setup.c
index 56ec47039c16..d288f7b01842 100644
--- a/arch/mips/momentum/ocelot_g/setup.c
+++ b/arch/mips/momentum/ocelot_g/setup.c
@@ -57,6 +57,7 @@
#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>
@@ -160,6 +161,10 @@ static void __init setup_l3cache(unsigned long size)
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);