diff options
| author | Tom Cherry <tcherry@nvidia.com> | 2012-05-23 12:06:13 -0700 |
|---|---|---|
| committer | Tom Cherry <tcherry@nvidia.com> | 2012-05-23 12:06:13 -0700 |
| commit | a168c03bd97fd9761218779623db0cec09fa8f4a (patch) | |
| tree | 521d2b51904da963d771c24fd9b142cc416f8259 /sound/soc/tegra/tegra_wm8903.c | |
| parent | 11fb7d0e35d56230919eb91bee1aa138a10b8416 (diff) | |
| parent | c7e3189c1802c2a6552eec960f521a1891529892 (diff) | |
Merge commit 'main-ics-2012.05.22-B3' into HEAD
Conflicts:
arch/arm/mach-tegra/pm.c
drivers/media/video/tegra/nvavp/nvavp_dev.c
drivers/power/smb349-charger.c
include/linux/smb349-charger.h
include/trace/events/power.h
Change-Id: Ia8c82e2acfe3463ae6778bdd03aac8da104f7ad3
Diffstat (limited to 'sound/soc/tegra/tegra_wm8903.c')
| -rw-r--r-- | sound/soc/tegra/tegra_wm8903.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sound/soc/tegra/tegra_wm8903.c b/sound/soc/tegra/tegra_wm8903.c index 55e4f61edfd2..ce608b007bef 100644 --- a/sound/soc/tegra/tegra_wm8903.c +++ b/sound/soc/tegra/tegra_wm8903.c @@ -805,7 +805,7 @@ static __devinit int tegra_wm8903_driver_probe(struct platform_device *pdev) machine->pdata = pdata; - ret = tegra_asoc_utils_init(&machine->util_data, &pdev->dev); + ret = tegra_asoc_utils_init(&machine->util_data, &pdev->dev, card); if (ret) goto err_free_machine; |