diff options
| author | Tony Lindgren <tony@atomide.com> | 2013-01-30 14:02:54 -0800 |
|---|---|---|
| committer | Tony Lindgren <tony@atomide.com> | 2013-01-30 14:02:54 -0800 |
| commit | 7b4bc07991564dfcdfd9e6e7cbebc9bf337111eb (patch) | |
| tree | 80fa1aa61a364aa6afaa1d14a92870e647954f5e /arch/arm/mach-omap2/timer.c | |
| parent | 949db153b6466c6f7cad5a427ecea94985927311 (diff) | |
| parent | aff2f7d90fc6553aa309db2a635d8e5d70d84916 (diff) | |
| download | olio-linux-3.10-7b4bc07991564dfcdfd9e6e7cbebc9bf337111eb.tar.xz olio-linux-3.10-7b4bc07991564dfcdfd9e6e7cbebc9bf337111eb.zip | |
Merge tag 'omap-cleanup-a-for-3.9' of git://git.kernel.org/pub/scm/linux/kernel/git/pjw/omap-pending into omap-for-v3.9/pm
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.
Basic test logs for this branch are here:
http://www.pwsan.com/omap/testlogs/cleanup_a_3.9/20130126014242/
Diffstat (limited to 'arch/arm/mach-omap2/timer.c')
| -rw-r--r-- | arch/arm/mach-omap2/timer.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/arch/arm/mach-omap2/timer.c b/arch/arm/mach-omap2/timer.c index b8ad6e632bb..63e5fb017fd 100644 --- a/arch/arm/mach-omap2/timer.c +++ b/arch/arm/mach-omap2/timer.c @@ -702,8 +702,7 @@ static int __init omap_timer_init(struct omap_hwmod *oh, void *unused) pdata->timer_errata = omap_dm_timer_get_errata(); pdata->get_context_loss_count = omap_pm_get_dev_context_loss_count; - pdev = omap_device_build(name, id, oh, pdata, sizeof(*pdata), - NULL, 0, 0); + pdev = omap_device_build(name, id, oh, pdata, sizeof(*pdata)); if (IS_ERR(pdev)) { pr_err("%s: Can't build omap_device for %s: %s.\n", |