From: Juha Yrjola <juha.yrjola@nokia.com>
Date: Tue, 18 Apr 2006 17:02:48 +0000 (+0300)
Subject: Merge source.mvista.com:linux-omap
X-Git-Tag: v2.6.17-omap1~101
X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=330c1eb9a689973326cdece277d0b4b409833bb9;p=linux-2.6-omap-h63xx.git

Merge source.mvista.com:linux-omap

Conflicts:

	arch/arm/mach-omap1/board-nokia770.c
	drivers/i2c/chips/tlv320aic23.c
	sound/arm/omap-aic23.h
---

330c1eb9a689973326cdece277d0b4b409833bb9
diff --cc arch/arm/mach-omap1/board-nokia770.c
index 8f7a40bbcf3,02b980d77b1..ffbeca7f4a7
--- a/arch/arm/mach-omap1/board-nokia770.c
+++ b/arch/arm/mach-omap1/board-nokia770.c
@@@ -184,7 -193,8 +193,8 @@@ static void codec_delayed_power_down(vo
  {
  	down(&audio_pwr_sem);
  	if (audio_pwr_state == -1)
 -		tlv320aic23_power_down();
 +		aic23_power_down();
+ 	clk_disable(dspxor_ck);
  	up(&audio_pwr_sem);
  }