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]
/
include
/
asm-arm
/
mach
/
arch.h
diff --git
a/include/asm-arm/mach/arch.h
b/include/asm-arm/mach/arch.h
index
d751faf
..
5c37b70
100644
(file)
--- a/
include/asm-arm/mach/arch.h
+++ b/
include/asm-arm/mach/arch.h
@@
-8,12
+8,6
@@
* published by the Free Software Foundation.
*/
* published by the Free Software Foundation.
*/
-/*
- * The size of struct machine_desc
- * (for assembler code)
- */
-#define SIZEOF_MACHINE_DESC 52
-
#ifndef __ASSEMBLY__
struct tag;
#ifndef __ASSEMBLY__
struct tag;
@@
-45,6
+39,7
@@
struct machine_desc {
struct meminfo *);
void (*map_io)(void);/* IO mapping function */
void (*init_irq)(void);
struct meminfo *);
void (*map_io)(void);/* IO mapping function */
void (*init_irq)(void);
+ void (*init_time)(void);
void (*init_machine)(void);
};
void (*init_machine)(void);
};
@@
-87,6
+82,9
@@
const struct machine_desc __mach_desc_##_type \
#define INITIRQ(_func) \
.init_irq = _func,
#define INITIRQ(_func) \
.init_irq = _func,
+#define INITTIME(_func) \
+ .init_time = _func,
+
#define INIT_MACHINE(_func) \
.init_machine = _func,
#define INIT_MACHINE(_func) \
.init_machine = _func,