diff options
| author | Tony Lindgren <tony@atomide.com> | 2010-12-22 14:32:24 -0500 |
|---|---|---|
| committer | Tony Lindgren <tony@atomide.com> | 2010-12-22 14:32:24 -0500 |
| commit | 808601b75804475c9022f6375e76b7c62c99a10a (patch) | |
| tree | 355a3100269e88460e36f251ef0ce2f1ed88d52e /arch/arm/mach-omap2/control.h | |
| parent | c10abbb26513f4ccff89c4d80912cb4d36fcd3e8 (diff) | |
| parent | f17f9726c27c3921e00a5750e85070e6dd7e1ff7 (diff) | |
Merge branch 'integration-2.6.38-for-tony' of git://git.pwsan.com/linux-2.6 into omap-for-linus
Diffstat (limited to 'arch/arm/mach-omap2/control.h')
| -rw-r--r-- | arch/arm/mach-omap2/control.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/arch/arm/mach-omap2/control.h b/arch/arm/mach-omap2/control.h index ea20dc310522..208a670c826b 100644 --- a/arch/arm/mach-omap2/control.h +++ b/arch/arm/mach-omap2/control.h | |||
| @@ -357,7 +357,9 @@ extern u32 *get_omap3630_restore_pointer(void); | |||
| 357 | extern u32 omap3_arm_context[128]; | 357 | extern u32 omap3_arm_context[128]; |
| 358 | extern void omap3_control_save_context(void); | 358 | extern void omap3_control_save_context(void); |
| 359 | extern void omap3_control_restore_context(void); | 359 | extern void omap3_control_restore_context(void); |
| 360 | extern void omap3_ctrl_write_boot_mode(u8 bootmode); | ||
| 360 | extern void omap3630_ctrl_disable_rta(void); | 361 | extern void omap3630_ctrl_disable_rta(void); |
| 362 | extern int omap3_ctrl_save_padconf(void); | ||
| 361 | #else | 363 | #else |
| 362 | #define omap_ctrl_base_get() 0 | 364 | #define omap_ctrl_base_get() 0 |
| 363 | #define omap_ctrl_readb(x) 0 | 365 | #define omap_ctrl_readb(x) 0 |