diff options
| author | Tony Lindgren <tony@atomide.com> | 2010-02-25 05:53:03 +0100 |
|---|---|---|
| committer | Tony Lindgren <tony@atomide.com> | 2010-02-25 05:53:03 +0100 |
| commit | b610ec502376d915b76a62e22576c5d0462cc9c9 (patch) | |
| tree | 55206c47da1f010588964edafe09284fce704b63 /arch/arm/plat-omap/include/plat/prcm.h | |
| parent | Merge branch 'pm-2.6.34' of git://git.kernel.org/pub/scm/linux/kernel/git/khi... (diff) | |
| parent | OMAP4: clock: Remove clock hacks from timer-gp.c (diff) | |
| download | linux-b610ec502376d915b76a62e22576c5d0462cc9c9.tar.xz linux-b610ec502376d915b76a62e22576c5d0462cc9c9.zip | |
Merge branch 'for_2.6.34_b' of git://git.pwsan.com/linux-2.6 into omap-for-linus
Diffstat (limited to 'arch/arm/plat-omap/include/plat/prcm.h')
| -rw-r--r-- | arch/arm/plat-omap/include/plat/prcm.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/arch/arm/plat-omap/include/plat/prcm.h b/arch/arm/plat-omap/include/plat/prcm.h index 66938a9f8dae..d6a0e27d5a7f 100644 --- a/arch/arm/plat-omap/include/plat/prcm.h +++ b/arch/arm/plat-omap/include/plat/prcm.h @@ -25,7 +25,8 @@ u32 omap_prcm_get_reset_sources(void); void omap_prcm_arch_reset(char mode); -int omap2_cm_wait_idlest(void __iomem *reg, u32 mask, const char *name); +int omap2_cm_wait_idlest(void __iomem *reg, u32 mask, u8 idlest, + const char *name); #define START_PADCONF_SAVE 0x2 #define PADCONF_SAVE_DONE 0x1 |