diff options
| author | Russell King <rmk@dyn-67.arm.linux.org.uk> | 2009-08-10 14:24:18 +0100 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2009-08-10 14:24:18 +0100 |
| commit | f40aac940aa83645ec2218ccce90cc1c6881b74c (patch) | |
| tree | 6d775da1489722a684f85249fa57528851e11957 /arch/arm/plat-omap/include/mach/prcm.h | |
| parent | 7063c88c726a704e648ba36ca78baa630f8b7b0a (diff) | |
| parent | 3c82e229f09a6acc8d24dc27c5e0e60b1d7161c2 (diff) | |
| download | talos-obmc-linux-f40aac940aa83645ec2218ccce90cc1c6881b74c.tar.gz talos-obmc-linux-f40aac940aa83645ec2218ccce90cc1c6881b74c.zip | |
Merge branch 'omap_fixes_31' of git://git.pwsan.com/linux-2.6
Diffstat (limited to 'arch/arm/plat-omap/include/mach/prcm.h')
| -rw-r--r-- | arch/arm/plat-omap/include/mach/prcm.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/arm/plat-omap/include/mach/prcm.h b/arch/arm/plat-omap/include/mach/prcm.h index 24ac3c715912..cda2a70397b4 100644 --- a/arch/arm/plat-omap/include/mach/prcm.h +++ b/arch/arm/plat-omap/include/mach/prcm.h @@ -25,6 +25,7 @@ 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); #endif |
