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/mach-omap2/devices.c | |
| 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/mach-omap2/devices.c')
| -rw-r--r-- | arch/arm/mach-omap2/devices.c | 2 |
1 files changed, 1 insertions, 1 deletions
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"); |