From: Peter Ujfalusi <peter.ujfalusi@ti.com>
Date: Tue, 14 Feb 2012 13:23:15 +0000 (+0200)
Subject: ASoC: omap-mcbsp: Merge the omap_mcbsp_data into omap_mcbsp structure
X-Git-Tag: v3.4-rc1~144^2~2^2~14
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=256d9c251fe6800a494206b96d2572e5a98762d5;p=pandora-kernel.git

ASoC: omap-mcbsp: Merge the omap_mcbsp_data into omap_mcbsp structure

Since the drivers has been merged, merge the two structures together.

Signed-off-by: Peter Ujfalusi <peter.ujfalusi@ti.com>
Tested-by: Grazvydas Ignotas <notasas@gmail.com>
Tested-by: Janusz Krzysztofik <jkrzyszt@tis.icnet.pl>
Acked-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
Acked-by: Jarkko Nikula <jarkko.nikula@bitmer.com>
Signed-off-by: Liam Girdwood <lrg@ti.com>
---

Reading git-diff-tree failed