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
Pull sony into release branch
[pandora-kernel.git]
/
arch
/
mips
/
vr41xx
/
common
/
init.c
diff --git
a/arch/mips/vr41xx/common/init.c
b/arch/mips/vr41xx/common/init.c
index
915bfa5
..
4f97e0b
100644
(file)
--- a/
arch/mips/vr41xx/common/init.c
+++ b/
arch/mips/vr41xx/common/init.c
@@
-24,6
+24,7
@@
#include <asm/bootinfo.h>
#include <asm/time.h>
#include <asm/bootinfo.h>
#include <asm/time.h>
+#include <asm/vr41xx/irq.h>
#include <asm/vr41xx/vr41xx.h>
#define IO_MEM_RESOURCE_START 0UL
#include <asm/vr41xx/vr41xx.h>
#define IO_MEM_RESOURCE_START 0UL
@@
-47,7
+48,7
@@
static void __init setup_timer_frequency(void)
mips_hpt_frequency = tclock / 4;
}
mips_hpt_frequency = tclock / 4;
}
-
static void __init setup_timer_irq
(struct irqaction *irq)
+
void __init plat_timer_setup
(struct irqaction *irq)
{
setup_irq(TIMER_IRQ, irq);
}
{
setup_irq(TIMER_IRQ, irq);
}
@@
-55,7
+56,6
@@
static void __init setup_timer_irq(struct irqaction *irq)
static void __init timer_init(void)
{
board_time_init = setup_timer_frequency;
static void __init timer_init(void)
{
board_time_init = setup_timer_frequency;
- board_timer_setup = setup_timer_irq;
}
void __init plat_mem_setup(void)
}
void __init plat_mem_setup(void)
@@
-81,7
+81,6
@@
void __init prom_init(void)
}
}
}
}
-
unsigned long __init prom_free_prom_memory
(void)
+
void __init prom_free_prom_memory
(void)
{
{
- return 0UL;
}
}