diff options
| author | Tony Lindgren <tony@atomide.com> | 2013-02-12 09:01:25 -0800 |
|---|---|---|
| committer | Tony Lindgren <tony@atomide.com> | 2013-02-12 09:01:25 -0800 |
| commit | 25e4d0f6df356ec7c2a09f6744c36a84b5537f33 (patch) | |
| tree | de69514f38e1df4f8ac834e0e49fe04ab46ff6b7 /arch/arm | |
| parent | 58a656b77a3d352631d058df0ac2a1da92e3a0f0 (diff) | |
| parent | 6efc3fe0f4058d6764e5c58c7377037f9da24d22 (diff) | |
| download | olio-linux-3.10-25e4d0f6df356ec7c2a09f6744c36a84b5537f33.tar.xz olio-linux-3.10-25e4d0f6df356ec7c2a09f6744c36a84b5537f33.zip | |
Merge branch 'omap-for-v3.9/pm-fix' into omap-for-v3.9/pm-wfi-take2
Diffstat (limited to 'arch/arm')
| -rw-r--r-- | arch/arm/mach-omap2/am35xx-emac.c | 3 | ||||
| -rw-r--r-- | arch/arm/mach-omap2/devices.c | 2 | ||||
| -rw-r--r-- | arch/arm/mach-omap2/sr_device.c | 2 |
3 files changed, 3 insertions, 4 deletions
diff --git a/arch/arm/mach-omap2/am35xx-emac.c b/arch/arm/mach-omap2/am35xx-emac.c index a00d39107a2..25b79a29736 100644 --- a/arch/arm/mach-omap2/am35xx-emac.c +++ b/arch/arm/mach-omap2/am35xx-emac.c @@ -62,8 +62,7 @@ static int __init omap_davinci_emac_dev_init(struct omap_hwmod *oh, { struct platform_device *pdev; - pdev = omap_device_build(oh->class->name, 0, oh, pdata, pdata_len, - false); + pdev = omap_device_build(oh->class->name, 0, oh, pdata, pdata_len); if (IS_ERR(pdev)) { WARN(1, "Can't build omap_device for %s:%s.\n", oh->class->name, oh->name); diff --git a/arch/arm/mach-omap2/devices.c b/arch/arm/mach-omap2/devices.c index d8a0cc3b9d2..6ecc89adda8 100644 --- a/arch/arm/mach-omap2/devices.c +++ b/arch/arm/mach-omap2/devices.c @@ -382,7 +382,7 @@ static void __init omap_init_hdmi_audio(void) return; } - pdev = omap_device_build("omap-hdmi-audio-dai", -1, oh, NULL, 0, 0); + pdev = omap_device_build("omap-hdmi-audio-dai", -1, oh, NULL, 0); WARN(IS_ERR(pdev), "Can't build omap_device for omap-hdmi-audio-dai.\n"); diff --git a/arch/arm/mach-omap2/sr_device.c b/arch/arm/mach-omap2/sr_device.c index bb829e06540..d7bc33f1534 100644 --- a/arch/arm/mach-omap2/sr_device.c +++ b/arch/arm/mach-omap2/sr_device.c @@ -152,7 +152,7 @@ static int __init sr_dev_init(struct omap_hwmod *oh, void *user) sr_data->enable_on_init = sr_enable_on_init; - pdev = omap_device_build(name, i, oh, sr_data, sizeof(*sr_data), 0); + pdev = omap_device_build(name, i, oh, sr_data, sizeof(*sr_data)); if (IS_ERR(pdev)) pr_warning("%s: Could not build omap_device for %s: %s.\n\n", __func__, name, oh->name); |