Merge branch 'omap-for-v3.9/pm-fix' into omap-for-v3.9/pm-wfi-take2

Author: tmlind

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);

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");
 

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);