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/hwspinlock.c | |
| parent | 949db153b6466c6f7cad5a427ecea94985927311 (diff) | |
| parent | aff2f7d90fc6553aa309db2a635d8e5d70d84916 (diff) | |
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/hwspinlock.c')
| -rw-r--r-- | arch/arm/mach-omap2/hwspinlock.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/arch/arm/mach-omap2/hwspinlock.c b/arch/arm/mach-omap2/hwspinlock.c index 1df9b5feda1..c3688903f3d 100644 --- a/arch/arm/mach-omap2/hwspinlock.c +++ b/arch/arm/mach-omap2/hwspinlock.c @@ -46,8 +46,7 @@ static int __init hwspinlocks_init(void) return -EINVAL; pdev = omap_device_build(dev_name, 0, oh, &omap_hwspinlock_pdata, - sizeof(struct hwspinlock_pdata), - NULL, 0, false); + sizeof(struct hwspinlock_pdata)); if (IS_ERR(pdev)) { pr_err("Can't build omap_device for %s:%s\n", dev_name, oh_name); |