git://git.onelab.eu
/
linux-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge to Fedora kernel-2.6.7-1.492
[linux-2.6.git]
/
arch
/
arm
/
mach-sa1100
/
empeg.c
diff --git
a/arch/arm/mach-sa1100/empeg.c
b/arch/arm/mach-sa1100/empeg.c
index
b1faaa9
..
6ab57cd
100644
(file)
--- a/
arch/arm/mach-sa1100/empeg.c
+++ b/
arch/arm/mach-sa1100/empeg.c
@@
-35,4
+35,5
@@
MACHINE_START(EMPEG, "empeg MP3 Car Audio Player")
BOOT_MEM(0xc0000000, 0x80000000, 0xf8000000)
MAPIO(empeg_map_io)
INITIRQ(sa1100_init_irq)
+ INITTIME(sa1100_init_time)
MACHINE_END