git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'for-linus' of master.kernel.org:/pub/scm/linux/kernel/git/dtor/input
[pandora-kernel.git]
/
arch
/
mips
/
lasat
/
setup.c
diff --git
a/arch/mips/lasat/setup.c
b/arch/mips/lasat/setup.c
index
14c5516
..
488007f
100644
(file)
--- a/
arch/mips/lasat/setup.c
+++ b/
arch/mips/lasat/setup.c
@@
-116,7
+116,6
@@
static void lasat_time_init(void)
void __init plat_timer_setup(struct irqaction *irq)
{
void __init plat_timer_setup(struct irqaction *irq)
{
- write_c0_compare( read_c0_count() + mips_hpt_frequency / HZ);
change_c0_status(ST0_IM, IE_IRQ0 | IE_IRQ5);
}
change_c0_status(ST0_IM, IE_IRQ0 | IE_IRQ5);
}
@@
-179,5
+178,5
@@
void __init plat_mem_setup(void)
/* Switch from prom exception handler to normal mode */
change_c0_status(ST0_BEV,0);
/* Switch from prom exception handler to normal mode */
change_c0_status(ST0_BEV,0);
- pr
om_printf
("Lasat specific initialization complete\n");
+ pr
_info
("Lasat specific initialization complete\n");
}
}