diff options
| author | Nicolas Pitre <nicolas.pitre@linaro.org> | 2011-04-18 15:16:23 -0400 |
|---|---|---|
| committer | Nicolas Pitre <nicolas.pitre@linaro.org> | 2011-04-18 15:16:23 -0400 |
| commit | 2a7f487cf26649ab3e9a8d8b366325fedc63c231 (patch) | |
| tree | e0bb1e30c3fda79b5b542c8d62876e8d1caa5b5a /arch/arm/plat-omap/include/plat/omap_hwmod.h | |
| parent | 4fcd294d4a6e156cccd077f24c6a255298df0fd8 (diff) | |
| parent | c54d751aad27da1e9dabdea706dd627379a0a7be (diff) | |
Merge remote-tracking branch 'agreen/for-nicolas' into linaro-2.6.38testing
Diffstat (limited to 'arch/arm/plat-omap/include/plat/omap_hwmod.h')
| -rw-r--r-- | arch/arm/plat-omap/include/plat/omap_hwmod.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/arch/arm/plat-omap/include/plat/omap_hwmod.h b/arch/arm/plat-omap/include/plat/omap_hwmod.h index 1adea9c6298..5bcbca86170 100644 --- a/arch/arm/plat-omap/include/plat/omap_hwmod.h +++ b/arch/arm/plat-omap/include/plat/omap_hwmod.h @@ -551,6 +551,8 @@ int omap_hwmod_for_each(int (*fn)(struct omap_hwmod *oh, void *data), int __init omap_hwmod_setup_one(const char *name); +int __init omap_hwmod_setup_one(const char *name); + int omap_hwmod_enable(struct omap_hwmod *oh); int _omap_hwmod_enable(struct omap_hwmod *oh); int omap_hwmod_idle(struct omap_hwmod *oh); |