diff options
| author | Paul Walmsley <paul@pwsan.com> | 2012-09-23 23:16:04 (GMT) |
|---|---|---|
| committer | Paul Walmsley <paul@pwsan.com> | 2012-09-23 23:16:04 (GMT) |
| commit | 1e2ee2a60df5c3ab74dd1c9155fb01b5bc6f807d (patch) | |
| tree | 2adb98096c4a6dec0ceff4e7e04610a079f14026 /arch/arm/plat-omap | |
| parent | 291852e8791a596195edc3ced96481bfd105f35b (diff) | |
| parent | 11964f53eb4d9ce59a058be9999d9cfcb1ced878 (diff) | |
| download | linux-fsl-qoriq-1e2ee2a60df5c3ab74dd1c9155fb01b5bc6f807d.tar.xz | |
Merge tag 'omap-devel-am33xx-for-v3.7' into test_v3.6-rc6_ocb3.7_cff3.7_odaf3.7
From Paul Walmsley <paul@pwsan.com>:
AM33xx hwmod data and miscellaneous clock and hwmod fixes. AM33xx
should now boot on mainline after this is applied, according to
Vaibhav.
Diffstat (limited to 'arch/arm/plat-omap')
| -rw-r--r-- | arch/arm/plat-omap/include/plat/omap_hwmod.h | 1 |
1 files changed, 1 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 6132972..9b9646c 100644 --- a/arch/arm/plat-omap/include/plat/omap_hwmod.h +++ b/arch/arm/plat-omap/include/plat/omap_hwmod.h @@ -658,6 +658,7 @@ extern int omap2420_hwmod_init(void); extern int omap2430_hwmod_init(void); extern int omap3xxx_hwmod_init(void); extern int omap44xx_hwmod_init(void); +extern int am33xx_hwmod_init(void); extern int __init omap_hwmod_register_links(struct omap_hwmod_ocp_if **ois); |