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
/
badge4.c
diff --git
a/arch/arm/mach-sa1100/badge4.c
b/arch/arm/mach-sa1100/badge4.c
index
71d9e16
..
cef7104
100644
(file)
--- a/
arch/arm/mach-sa1100/badge4.c
+++ b/
arch/arm/mach-sa1100/badge4.c
@@
-245,4
+245,5
@@
MACHINE_START(BADGE4, "Hewlett-Packard Laboratories BadgePAD 4")
BOOT_PARAMS(0xc0000100)
MAPIO(badge4_map_io)
INITIRQ(sa1100_init_irq)
+ INITTIME(sa1100_init_time)
MACHINE_END