diff options
| author | Paul Walmsley <paul@pwsan.com> | 2012-09-22 10:00:35 -0600 |
|---|---|---|
| committer | Paul Walmsley <paul@pwsan.com> | 2012-09-22 10:00:35 -0600 |
| commit | 9fe0624e1b9faa43d1f6136c70409c4716fb73c9 (patch) | |
| tree | ec734f2da98e41c780a251e1e21adaa726e5bc3a /arch/arm/plat-omap | |
| parent | 5dbd6535d5bcb9d1899dd27d209ca651431df66b (diff) | |
| parent | 11964f53eb4d9ce59a058be9999d9cfcb1ced878 (diff) | |
| download | blackbird-obmc-linux-9fe0624e1b9faa43d1f6136c70409c4716fb73c9.tar.gz blackbird-obmc-linux-9fe0624e1b9faa43d1f6136c70409c4716fb73c9.zip | |
Merge tag 'omap-devel-am33xx-for-v3.7' into test_v3.6-rc6_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 6132972aff37..9b9646c3673d 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); |
