From ede8e3c8d6da57517e821a10e9d08401468cf8c5 Mon Sep 17 00:00:00 2001
From: Stephen Warren <swarren@nvidia.com>
Date: Wed, 5 Sep 2012 10:27:14 -0600
Subject: [PATCH] --- yaml --- r: 332053 b: refs/heads/master c:
 03f67433758a3eeb37b9c1559886c377da874ad2 h: refs/heads/master i:   332051:
 d5249a9083de53ad2d09c630c6b06007fe2f68c6 v: v3

---
 [refs]                                                     | 2 +-
 .../tegra_wm8903_pdata.h => include/sound/tegra_wm8903.h}  | 7 +++++--
 trunk/sound/soc/tegra/tegra_wm8903.c                       | 3 +--
 3 files changed, 7 insertions(+), 5 deletions(-)
 rename trunk/{arch/arm/mach-tegra/include/mach/tegra_wm8903_pdata.h => include/sound/tegra_wm8903.h} (89%)

diff --git a/[refs] b/[refs]
index c906ca8e1232..76d3b313d49a 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 5d86e25c70407cd97a5aa8f39cc3be390bcab116
+refs/heads/master: 03f67433758a3eeb37b9c1559886c377da874ad2
diff --git a/trunk/arch/arm/mach-tegra/include/mach/tegra_wm8903_pdata.h b/trunk/include/sound/tegra_wm8903.h
similarity index 89%
rename from trunk/arch/arm/mach-tegra/include/mach/tegra_wm8903_pdata.h
rename to trunk/include/sound/tegra_wm8903.h
index 9d293344a7ff..57b202ee97c3 100644
--- a/trunk/arch/arm/mach-tegra/include/mach/tegra_wm8903_pdata.h
+++ b/trunk/include/sound/tegra_wm8903.h
@@ -1,6 +1,4 @@
 /*
- * arch/arm/mach-tegra/include/mach/tegra_wm8903_pdata.h
- *
  * Copyright 2011 NVIDIA, Inc.
  *
  * This software is licensed under the terms of the GNU General Public
@@ -14,6 +12,9 @@
  *
  */
 
+#ifndef __SOUND_TEGRA_WM38903_H
+#define __SOUND_TEGRA_WM38903_H
+
 struct tegra_wm8903_platform_data {
 	int gpio_spkr_en;
 	int gpio_hp_det;
@@ -21,3 +22,5 @@ struct tegra_wm8903_platform_data {
 	int gpio_int_mic_en;
 	int gpio_ext_mic_en;
 };
+
+#endif
diff --git a/trunk/sound/soc/tegra/tegra_wm8903.c b/trunk/sound/soc/tegra/tegra_wm8903.c
index d4f14e492341..cee13b7bfb94 100644
--- a/trunk/sound/soc/tegra/tegra_wm8903.c
+++ b/trunk/sound/soc/tegra/tegra_wm8903.c
@@ -34,13 +34,12 @@
 #include <linux/gpio.h>
 #include <linux/of_gpio.h>
 
-#include <mach/tegra_wm8903_pdata.h>
-
 #include <sound/core.h>
 #include <sound/jack.h>
 #include <sound/pcm.h>
 #include <sound/pcm_params.h>
 #include <sound/soc.h>
+#include <sound/tegra_wm8903.h>
 
 #include "../codecs/wm8903.h"