diff options
| author | Tony Lindgren <tony@atomide.com> | 2011-10-04 13:54:30 -0700 |
|---|---|---|
| committer | Tony Lindgren <tony@atomide.com> | 2011-10-04 13:54:30 -0700 |
| commit | 3ae3e253db7385238dd9d6c67c085afa3e770a56 (patch) | |
| tree | c3f93d9742c4654c9d10af829db1122bac0b6f6f /arch/arm/mach-omap2/dma.c | |
| parent | c541c15fb5ab48c47bc9b90121538fd30d152f23 (diff) | |
| parent | 476b679a5d785d1244f6b43ad26877acf278cd18 (diff) | |
Merge branch 'for_3.2/3_omap_devicetree' of git://gitorious.org/omap-pm/linux into dt
Diffstat (limited to 'arch/arm/mach-omap2/dma.c')
| -rw-r--r-- | arch/arm/mach-omap2/dma.c | 11 |
1 files changed, 1 insertions, 10 deletions
diff --git a/arch/arm/mach-omap2/dma.c b/arch/arm/mach-omap2/dma.c index ae8cb3fb1830..a59a45a0096e 100644 --- a/arch/arm/mach-omap2/dma.c +++ b/arch/arm/mach-omap2/dma.c @@ -87,14 +87,6 @@ static u16 reg_map[] = { [CCDN] = 0xd8, }; -static struct omap_device_pm_latency omap2_dma_latency[] = { - { - .deactivate_func = omap_device_idle_hwmods, - .activate_func = omap_device_enable_hwmods, - .flags = OMAP_DEVICE_LATENCY_AUTO_ADJUST, - }, -}; - static void __iomem *dma_base; static inline void dma_write(u32 val, int reg, int lch) { @@ -258,8 +250,7 @@ static int __init omap2_system_dma_init_dev(struct omap_hwmod *oh, void *unused) p->errata = configure_dma_errata(); - pdev = omap_device_build(name, 0, oh, p, sizeof(*p), - omap2_dma_latency, ARRAY_SIZE(omap2_dma_latency), 0); + pdev = omap_device_build(name, 0, oh, p, sizeof(*p), NULL, 0, 0); kfree(p); if (IS_ERR(pdev)) { pr_err("%s: Can't build omap_device for %s:%s.\n", |