summaryrefslogtreecommitdiffstats
path: root/arch/mips/mips-boards/malta/malta_setup.c
diff options
context:
space:
mode:
authorPaul Mackerras <paulus@samba.org>2006-08-01 10:37:25 +1000
committerPaul Mackerras <paulus@samba.org>2006-08-01 10:37:25 +1000
commit57cad8084e0837e0f2c97da789ec9b3f36809be9 (patch)
treee9c790afb4286f78cb08d9664f58baa7e876fe55 /arch/mips/mips-boards/malta/malta_setup.c
parentcb18bd40030c879cd93fef02fd579f74dbab473d (diff)
parent49b1e3ea19b1c95c2f012b8331ffb3b169e4c042 (diff)
downloadop-kernel-dev-57cad8084e0837e0f2c97da789ec9b3f36809be9.zip
op-kernel-dev-57cad8084e0837e0f2c97da789ec9b3f36809be9.tar.gz
Merge branch 'merge'
Diffstat (limited to 'arch/mips/mips-boards/malta/malta_setup.c')
-rw-r--r--arch/mips/mips-boards/malta/malta_setup.c4
1 files changed, 1 insertions, 3 deletions
diff --git a/arch/mips/mips-boards/malta/malta_setup.c b/arch/mips/mips-boards/malta/malta_setup.c
index bc4ac6f..ab460f8 100644
--- a/arch/mips/mips-boards/malta/malta_setup.c
+++ b/arch/mips/mips-boards/malta/malta_setup.c
@@ -19,7 +19,7 @@
#include <linux/sched.h>
#include <linux/ioport.h>
#include <linux/pci.h>
-#include <linux/tty.h>
+#include <linux/screen_info.h>
#ifdef CONFIG_MTD
#include <linux/mtd/partitions.h>
@@ -44,7 +44,6 @@
extern void mips_reboot_setup(void);
extern void mips_time_init(void);
-extern void mips_timer_setup(struct irqaction *irq);
extern unsigned long mips_rtc_get_time(void);
#ifdef CONFIG_KGDB
@@ -223,6 +222,5 @@ void __init plat_mem_setup(void)
mips_reboot_setup();
board_time_init = mips_time_init;
- board_timer_setup = mips_timer_setup;
rtc_mips_get_time = mips_rtc_get_time;
}
OpenPOWER on IntegriCloud