From d32d25b1f4de0740f1af279dff348693a51482b2 Mon Sep 17 00:00:00 2001
From: Andrew Lunn <andrew@lunn.ch>
Date: Tue, 6 Mar 2012 07:31:04 +0100
Subject: [PATCH] --- yaml --- r: 296717 b: refs/heads/master c:
 7399532065a68cce8b0ea18aace7ded45bfb205f h: refs/heads/master i:   296715:
 120b8a2ea374ab429fe1f2ef45ab44d91f847336 v: v3

---
 [refs]                                         | 2 +-
 trunk/arch/arm/mach-kirkwood/common.c          | 1 -
 trunk/arch/arm/plat-orion/include/plat/audio.h | 1 -
 3 files changed, 1 insertion(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index cb4a740ba333..1b4915b90088 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: d34b7d452397d16a895b9a0eddcf6b69f46074d2
+refs/heads/master: 7399532065a68cce8b0ea18aace7ded45bfb205f
diff --git a/trunk/arch/arm/mach-kirkwood/common.c b/trunk/arch/arm/mach-kirkwood/common.c
index 77d4852e19f2..79a9fe7e96a0 100644
--- a/trunk/arch/arm/mach-kirkwood/common.c
+++ b/trunk/arch/arm/mach-kirkwood/common.c
@@ -450,7 +450,6 @@ void __init kirkwood_init(void)
 {
 	printk(KERN_INFO "Kirkwood: %s, TCLK=%d.\n",
 		kirkwood_id(), kirkwood_tclk);
-	kirkwood_i2s_data.tclk = kirkwood_tclk;
 
 	/*
 	 * Disable propagation of mbus errors to the CPU local bus,
diff --git a/trunk/arch/arm/plat-orion/include/plat/audio.h b/trunk/arch/arm/plat-orion/include/plat/audio.h
index 885f8abd927b..d6a55bd2e578 100644
--- a/trunk/arch/arm/plat-orion/include/plat/audio.h
+++ b/trunk/arch/arm/plat-orion/include/plat/audio.h
@@ -2,7 +2,6 @@
 #define __PLAT_AUDIO_H
 
 struct kirkwood_asoc_platform_data {
-	u32 tclk;
 	int burst;
 };
 #endif