summaryrefslogtreecommitdiffstats
path: root/arch/mips/au1000/common/setup.c
diff options
context:
space:
mode:
authorPaul Mackerras <paulus@samba.org>2006-08-01 02:37:25 +0200
committerPaul Mackerras <paulus@samba.org>2006-08-01 02:37:25 +0200
commit57cad8084e0837e0f2c97da789ec9b3f36809be9 (patch)
treee9c790afb4286f78cb08d9664f58baa7e876fe55 /arch/mips/au1000/common/setup.c
parent[POWERPC] Instrument Hypervisor Calls: merge headers (diff)
parentMerge branch 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/paulus/... (diff)
downloadlinux-57cad8084e0837e0f2c97da789ec9b3f36809be9.tar.xz
linux-57cad8084e0837e0f2c97da789ec9b3f36809be9.zip
Merge branch 'merge'
Diffstat (limited to 'arch/mips/au1000/common/setup.c')
-rw-r--r--arch/mips/au1000/common/setup.c2
1 files changed, 0 insertions, 2 deletions
diff --git a/arch/mips/au1000/common/setup.c b/arch/mips/au1000/common/setup.c
index cc5138ce9c95..377ae0d8ff00 100644
--- a/arch/mips/au1000/common/setup.c
+++ b/arch/mips/au1000/common/setup.c
@@ -51,7 +51,6 @@ extern void au1000_power_off(void);
extern void au1x_time_init(void);
extern void au1x_timer_setup(struct irqaction *irq);
extern void au1xxx_time_init(void);
-extern void au1xxx_timer_setup(struct irqaction *irq);
extern void set_cpuspec(void);
void __init plat_mem_setup(void)
@@ -123,7 +122,6 @@ void __init plat_mem_setup(void)
_machine_halt = au1000_halt;
pm_power_off = au1000_power_off;
board_time_init = au1xxx_time_init;
- board_timer_setup = au1xxx_timer_setup;
/* IO/MEM resources. */
set_io_port_base(0);