diff options
| author | Olof Johansson <olof@lixom.net> | 2012-12-15 22:20:58 -0800 |
|---|---|---|
| committer | Olof Johansson <olof@lixom.net> | 2012-12-17 10:04:27 -0800 |
| commit | 0f600f40d752fe1f47aca29b8b95140283beda6b (patch) | |
| tree | 4f5b82a1172506970324bb20fe6d8dd23570fe89 /drivers/amba/tegra-ahb.c | |
| parent | 6a2461a49dad961c1a7feea6617bf8252826ee3f (diff) | |
| parent | f110174910896b7a7d91c0c60d19136815f68c54 (diff) | |
Merge tag 'tegra-for-3.8-fixes-for-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/swarren/linux-tegra into fixes
ARM: tegra: fixes for 3.8
This branch contains a few miscellaneous fixes that have shown up in the
last few weeks.
By Sivaram Nair (2) and Hiroshi Doyu (1)
via Stephen Warren
* tag 'tegra-for-3.8-fixes-for-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/swarren/linux-tegra:
amba: tegra-ahb: Fix warning w/o PM_SLEEP
ARM: tegra: fix comment in dsib clk set_parent
ARM: tegra: select correct parent clk for pll_p
Signed-off-by: Olof Johansson <olof@lixom.net>
Diffstat (limited to 'drivers/amba/tegra-ahb.c')
| -rw-r--r-- | drivers/amba/tegra-ahb.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/amba/tegra-ahb.c b/drivers/amba/tegra-ahb.c index bd5de08ad6fd..0576a7dd32a5 100644 --- a/drivers/amba/tegra-ahb.c +++ b/drivers/amba/tegra-ahb.c @@ -157,6 +157,7 @@ int tegra_ahb_enable_smmu(struct device_node *dn) EXPORT_SYMBOL(tegra_ahb_enable_smmu); #endif +#ifdef CONFIG_PM_SLEEP static int tegra_ahb_suspend(struct device *dev) { int i; @@ -176,6 +177,7 @@ static int tegra_ahb_resume(struct device *dev) gizmo_writel(ahb, ahb->ctx[i], tegra_ahb_gizmo[i]); return 0; } +#endif static UNIVERSAL_DEV_PM_OPS(tegra_ahb_pm, tegra_ahb_suspend, |