Merge branch 'twl4030-mfd' into for-2.6.33

arch/arm/mach-omap2/board-zoom2.c

@@ -236,6 +236,7 @@ static struct twl4030_codec_audio_data zoom2_audio_data = {
 };
 
 static struct twl4030_codec_data zoom2_codec_data = {
+	.audio_mclk = 26000000,
 	.audio = &zoom2_audio_data,
 };