projects
/
oweals
/
u-boot.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge git://git.denx.de/u-boot-i2c
[oweals/u-boot.git]
/
arch
/
powerpc
/
cpu
/
mpc83xx
/
interrupts.c
diff --git
a/arch/powerpc/cpu/mpc83xx/interrupts.c
b/arch/powerpc/cpu/mpc83xx/interrupts.c
index 668aa020889ebe9f22f5eaa5ad606f50d96ce027..50503b4d2c0f150fac67876673ca3ce7a84b6bdc 100644
(file)
--- a/
arch/powerpc/cpu/mpc83xx/interrupts.c
+++ b/
arch/powerpc/cpu/mpc83xx/interrupts.c
@@
-20,7
+20,7
@@
struct irq_action {
ulong count;
};
ulong count;
};
-
int
interrupt_init_cpu (unsigned *decrementer_count)
+
void
interrupt_init_cpu (unsigned *decrementer_count)
{
volatile immap_t *immr = (immap_t *) CONFIG_SYS_IMMR;
{
volatile immap_t *immr = (immap_t *) CONFIG_SYS_IMMR;
@@
-29,8
+29,6
@@
int interrupt_init_cpu (unsigned *decrementer_count)
/* Enable e300 time base */
immr->sysconf.spcr |= 0x00400000;
/* Enable e300 time base */
immr->sysconf.spcr |= 0x00400000;
-
- return 0;
}
}