diff options
author | Paul Mundt <lethal@linux-sh.org> | 2011-07-25 17:22:29 +0900 |
---|---|---|
committer | Paul Mundt <lethal@linux-sh.org> | 2011-07-25 17:22:29 +0900 |
commit | b79b3e05b1229d5b2fc2af71dc29701642577eba (patch) | |
tree | bcdf728ccfab02d66e129cacaa106bf8cc60f2d6 /arch/arm/mach-omap2/control.h | |
parent | ARM: static should be at beginning of declaration (diff) | |
parent | ARM: mach-shmobile: ag5evm: SDHI requires waiting for idle (diff) | |
download | linux-dev-b79b3e05b1229d5b2fc2af71dc29701642577eba.tar.xz linux-dev-b79b3e05b1229d5b2fc2af71dc29701642577eba.zip |
Merge branch 'rmobile/sdio' into rmobile-latest
Diffstat (limited to 'arch/arm/mach-omap2/control.h')
-rw-r--r-- | arch/arm/mach-omap2/control.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/arch/arm/mach-omap2/control.h b/arch/arm/mach-omap2/control.h index a016c8b59e00..d4ef75d5a382 100644 --- a/arch/arm/mach-omap2/control.h +++ b/arch/arm/mach-omap2/control.h @@ -386,9 +386,9 @@ extern void omap4_ctrl_pad_writel(u32 val, u16 offset); extern void omap3_save_scratchpad_contents(void); extern void omap3_clear_scratchpad_contents(void); -extern u32 *get_restore_pointer(void); -extern u32 *get_es3_restore_pointer(void); -extern u32 *get_omap3630_restore_pointer(void); +extern void omap3_restore(void); +extern void omap3_restore_es3(void); +extern void omap3_restore_3630(void); extern u32 omap3_arm_context[128]; extern void omap3_control_save_context(void); extern void omap3_control_restore_context(void); |