lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'integration-2.6.38-for-tony' of git://git.pwsan.com/linux-2.6 into omap-for-linus

Browse Source
This commit is contained in:
Tony Lindgren
2010-12-22 11:32:24 -08:00
parent c10abbb265 f17f9726c2
commit 808601b758
131 changed files with 6952 additions and 4444 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
arch/arm/mach-omap2/control.h
View File

@@ -357,7 +357,9 @@ extern u32 *get_omap3630_restore_pointer(void);
extern u32 omap3_arm_context[128];
extern void omap3_control_save_context(void);
extern void omap3_control_restore_context(void);
extern void omap3_ctrl_write_boot_mode(u8 bootmode);
extern void omap3630_ctrl_disable_rta(void);
extern int omap3_ctrl_save_padconf(void);
#else
#define omap_ctrl_base_get() 0
#define omap_ctrl_readb(x) 0