diff options
| author | Tony Lindgren <tony@atomide.com> | 2013-02-11 09:19:44 -0800 |
|---|---|---|
| committer | Tony Lindgren <tony@atomide.com> | 2013-02-11 09:19:44 -0800 |
| commit | 8d61d7f94522a0c023ed79d4f690f2bfc8a41d96 (patch) | |
| tree | 4f2220861a4499700f66253da49e59c9769d32b0 /arch/arm/mach-omap2/omap-iommu.c | |
| parent | 88b62b915b0b7e25870eb0604ed9a92ba4bfc9f7 (diff) | |
| parent | 0e084c9c843320995b0e219f02880f910d439b37 (diff) | |
| download | blackbird-op-linux-8d61d7f94522a0c023ed79d4f690f2bfc8a41d96.tar.gz blackbird-op-linux-8d61d7f94522a0c023ed79d4f690f2bfc8a41d96.zip | |
Merge tag 'omap-for-v3.9/pm-signed' into omap-for-v3.9/pm-wfi-take2
OMAP PM related updates via Paul Walmsley <paul@pwsan.com>:
Remove some dead OMAP clock and device integration code and data.
Also, clean up the way that the OMAP device integration code blocks
WFI/WFE to use a consistent mechanism, controlled by a data flag.
Several OMAP2+ power management fixes, optimizations, and cleanup.
This series is a prerequisite for the functional powerdomain
conversion series.
Diffstat (limited to 'arch/arm/mach-omap2/omap-iommu.c')
| -rw-r--r-- | arch/arm/mach-omap2/omap-iommu.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/arch/arm/mach-omap2/omap-iommu.c b/arch/arm/mach-omap2/omap-iommu.c index 6da4f7ae9d7f..f7f38c7fd5ff 100644 --- a/arch/arm/mach-omap2/omap-iommu.c +++ b/arch/arm/mach-omap2/omap-iommu.c @@ -41,8 +41,7 @@ static int __init omap_iommu_dev_init(struct omap_hwmod *oh, void *unused) pdata->deassert_reset = omap_device_deassert_hardreset; } - pdev = omap_device_build("omap-iommu", i, oh, pdata, sizeof(*pdata), - NULL, 0, 0); + pdev = omap_device_build("omap-iommu", i, oh, pdata, sizeof(*pdata)); kfree(pdata); |
