From 53d9ce84c0839e3852521accca6ac654807fd5ae Mon Sep 17 00:00:00 2001
From: Qinghuang Feng <qhfeng.kernel@gmail.com>
Date: Tue, 25 Nov 2008 23:24:54 +0800
Subject: [PATCH] --- yaml --- r: 120255 b: refs/heads/master c:
 9e0f1b7f6bc5265847e995540981642c857f15b6 h: refs/heads/master i:   120253:
 83fee1384b33d48eb69b731adf218aafc96bd73a   120251:
 d0da20786483a874fccdea6fc486a1114be50d71   120247:
 33187de62fa3d035a7fa3d78ac0d5718fd98b0b2   120239:
 577b773feb78b25dd5bbce2e45c347b0200ba382   120223:
 6afcab7e3218450b756d994241555c1b3628a154   120191:
 7268e98421e972fce3c7cca3abaa917d874a2411 v: v3

---
 [refs]                     | 2 +-
 trunk/sound/soc/soc-core.c | 1 -
 2 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 70d4fc76b62a..f907ef2e37ca 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 5c0d7bb797a975691ca8bbc38e53da03c6e151bb
+refs/heads/master: 9e0f1b7f6bc5265847e995540981642c857f15b6
diff --git a/trunk/sound/soc/soc-core.c b/trunk/sound/soc/soc-core.c
index dbd92e12e860..00fccdd41bb0 100644
--- a/trunk/sound/soc/soc-core.c
+++ b/trunk/sound/soc/soc-core.c
@@ -1883,7 +1883,6 @@ EXPORT_SYMBOL_GPL(snd_soc_dai_set_pll);
 /**
  * snd_soc_dai_set_fmt - configure DAI hardware audio format.
  * @dai: DAI
- * @clk_id: DAI specific clock ID
  * @fmt: SND_SOC_DAIFMT_ format value.
  *
  * Configures the DAI hardware format and clocking.