diff options
| author | Tony Lindgren <tony@atomide.com> | 2012-03-05 14:25:35 -0800 |
|---|---|---|
| committer | Tony Lindgren <tony@atomide.com> | 2012-03-05 14:25:35 -0800 |
| commit | bb887688bccb48d94fa873f0f6cc7e7e3e4dc05e (patch) | |
| tree | 2c848a1cbb0215cbe07552f78d5c78b970a91d4d /arch/arm/plat-omap | |
| parent | 149f1d5c8d2fd6879cdf93ca70f1cb745e698a1e (diff) | |
| parent | 63371faf9198302c7ebd41e7fbe78eb6b57bba86 (diff) | |
Merge branch 'for_3.4/cleanup/sr' of git://git.kernel.org/pub/scm/linux/kernel/git/khilman/linux-omap-pm into sr
Diffstat (limited to 'arch/arm/plat-omap')
| -rw-r--r-- | arch/arm/plat-omap/include/plat/omap_hwmod.h | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/arch/arm/plat-omap/include/plat/omap_hwmod.h b/arch/arm/plat-omap/include/plat/omap_hwmod.h index 647010109af..9e8e63d52aa 100644 --- a/arch/arm/plat-omap/include/plat/omap_hwmod.h +++ b/arch/arm/plat-omap/include/plat/omap_hwmod.h @@ -484,7 +484,6 @@ struct omap_hwmod_class { * @main_clk: main clock: OMAP clock name * @_clk: pointer to the main struct clk (filled in at runtime) * @opt_clks: other device clocks that drivers can request (0..*) - * @vdd_name: voltage domain name * @voltdm: pointer to voltage domain (filled in at runtime) * @masters: ptr to array of OCP ifs that this hwmod can initiate on * @slaves: ptr to array of OCP ifs that this hwmod can respond on @@ -528,7 +527,6 @@ struct omap_hwmod { struct omap_hwmod_opt_clk *opt_clks; char *clkdm_name; struct clockdomain *clkdm; - char *vdd_name; struct omap_hwmod_ocp_if **masters; /* connect to *_IA */ struct omap_hwmod_ocp_if **slaves; /* connect to *_TA */ void *dev_attr; |