diff options
author | Shawn Guo <shawn.guo@linaro.org> | 2012-04-26 09:22:45 -0400 |
---|---|---|
committer | Shawn Guo <shawn.guo@linaro.org> | 2012-05-08 08:36:34 -0400 |
commit | 7fea1ba58e61c17fb59dfc50c408945f307addc6 (patch) | |
tree | 2403b16b9ea948964dfd3b2df8fb13eb0b84e652 /arch/arm/mach-sa1100/generic.h | |
parent | cc8f252b713e9c7170bcf6346638dbf6d489d775 (diff) |
ARM: sa1100: use machine specific hook for late init
Cc: Russell King <linux@arm.linux.org.uk>
Signed-off-by: Shawn Guo <shawn.guo@linaro.org>
Diffstat (limited to 'arch/arm/mach-sa1100/generic.h')
-rw-r--r-- | arch/arm/mach-sa1100/generic.h | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/arch/arm/mach-sa1100/generic.h b/arch/arm/mach-sa1100/generic.h index 9eb3b3cd5a63..a5b7c13da3e3 100644 --- a/arch/arm/mach-sa1100/generic.h +++ b/arch/arm/mach-sa1100/generic.h | |||
@@ -11,6 +11,7 @@ extern void __init sa1100_map_io(void); | |||
11 | extern void __init sa1100_init_irq(void); | 11 | extern void __init sa1100_init_irq(void); |
12 | extern void __init sa1100_init_gpio(void); | 12 | extern void __init sa1100_init_gpio(void); |
13 | extern void sa11x0_restart(char, const char *); | 13 | extern void sa11x0_restart(char, const char *); |
14 | extern void sa11x0_init_late(void); | ||
14 | 15 | ||
15 | #define SET_BANK(__nr,__start,__size) \ | 16 | #define SET_BANK(__nr,__start,__size) \ |
16 | mi->bank[__nr].start = (__start), \ | 17 | mi->bank[__nr].start = (__start), \ |
@@ -41,3 +42,9 @@ void sa11x0_register_mcp(struct mcp_plat_data *data); | |||
41 | 42 | ||
42 | struct sa1100fb_mach_info; | 43 | struct sa1100fb_mach_info; |
43 | void sa11x0_register_lcd(struct sa1100fb_mach_info *inf); | 44 | void sa11x0_register_lcd(struct sa1100fb_mach_info *inf); |
45 | |||
46 | #ifdef CONFIG_PM | ||
47 | int sa11x0_pm_init(void); | ||
48 | #else | ||
49 | static inline int sa11x0_pm_init(void) { return 0; } | ||
50 | #endif | ||