From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Mon, 14 Jul 2008 23:06:58 +0000 (-0700)
Subject: Merge branch 'for-linus' of master.kernel.org:/home/rmk/linux-2.6-arm
X-Git-Tag: v2.6.27-rc1~1095
X-Git-Url: https://asedeno.scripts.mit.edu/gitweb/?a=commitdiff_plain;h=85082fd7cbe3173198aac0eb5e85ab1edcc6352c;p=linux.git

Merge branch 'for-linus' of master.kernel.org:/home/rmk/linux-2.6-arm

* 'for-linus' of master.kernel.org:/home/rmk/linux-2.6-arm: (241 commits)
  [ARM] 5171/1: ep93xx: fix compilation of modules using clocks
  [ARM] 5133/2: at91sam9g20 defconfig file
  [ARM] 5130/4: Support for the at91sam9g20
  [ARM] 5160/1: IOP3XX: gpio/gpiolib support
  [ARM] at91: Fix NAND FLASH timings for at91sam9x evaluation kits.
  [ARM] 5084/1: zylonite: Register AC97 device
  [ARM] 5085/2: PXA: Move AC97 over to the new central device declaration model
  [ARM] 5120/1: pxa: correct platform driver names for PXA25x and PXA27x UDC drivers
  [ARM] 5147/1: pxaficp_ir: drop pxa_gpio_mode calls, as pin setting
  [ARM] 5145/1: PXA2xx: provide api to control IrDA pins state
  [ARM] 5144/1: pxaficp_ir: cleanup includes
  [ARM] pxa: remove pxa_set_cken()
  [ARM] pxa: allow clk aliases
  [ARM] Feroceon: don't disable BPU on boot
  [ARM] Orion: LED support for HP mv2120
  [ARM] Orion: add RD88F5181L-FXO support
  [ARM] Orion: add RD88F5181L-GE support
  [ARM] Orion: add Netgear WNR854T support
  [ARM] s3c2410_defconfig: update for current build
  [ARM] Acer n30: Minor style and indentation fixes.
  ...
---

85082fd7cbe3173198aac0eb5e85ab1edcc6352c
diff --cc sound/soc/pxa/pxa2xx-i2s.c
index 9c06553b9267,e130346732ba..8f96d87f7b4b
--- a/sound/soc/pxa/pxa2xx-i2s.c
+++ b/sound/soc/pxa/pxa2xx-i2s.c
@@@ -77,8 -82,12 +79,12 @@@ static struct pxa2xx_gpio gpio_bus[] = 
  static int pxa2xx_i2s_startup(struct snd_pcm_substream *substream)
  {
  	struct snd_soc_pcm_runtime *rtd = substream->private_data;
 -	struct snd_soc_cpu_dai *cpu_dai = rtd->dai->cpu_dai;
 +	struct snd_soc_dai *cpu_dai = rtd->dai->cpu_dai;
  
+ 	clk_i2s = clk_get(NULL, "I2SCLK");
+ 	if (IS_ERR(clk_i2s))
+ 		return PTR_ERR(clk_i2s);
+ 
  	if (!cpu_dai->active) {
  		SACR0 |= SACR0_RST;
  		SACR0 = 0;