summaryrefslogtreecommitdiffstats
path: root/arch
diff options
context:
space:
mode:
authorMark Brown <broonie@opensource.wolfsonmicro.com>2011-01-25 20:27:56 +0000
committerMark Brown <broonie@opensource.wolfsonmicro.com>2011-01-25 20:27:56 +0000
commit58cc357f86a342924b0ed5c590823035690a0b19 (patch)
treeffb69ddf494b8c21c798ef5b6267610ccfff12c0 /arch
parent16f9e062a70a81f5fcb597fbc2b8e8a0727a83ff (diff)
parentf221a9be2e511502b43b009fd83e748017ea117d (diff)
downloadlinux-58cc357f86a342924b0ed5c590823035690a0b19.tar.gz
linux-58cc357f86a342924b0ed5c590823035690a0b19.tar.bz2
linux-58cc357f86a342924b0ed5c590823035690a0b19.zip
Merge branch 'tegra-arch' into for-2.6.39
Diffstat (limited to 'arch')
-rw-r--r--arch/arm/mach-tegra/include/mach/harmony_audio.h19
1 files changed, 19 insertions, 0 deletions
diff --git a/arch/arm/mach-tegra/include/mach/harmony_audio.h b/arch/arm/mach-tegra/include/mach/harmony_audio.h
new file mode 100644
index 000000000000..5c46391ea7e3
--- /dev/null
+++ b/arch/arm/mach-tegra/include/mach/harmony_audio.h
@@ -0,0 +1,19 @@
+/*
+ * arch/arm/mach-tegra/include/mach/harmony_audio.h
+ *
+ * Copyright 2011 NVIDIA, Inc.
+ *
+ * This software is licensed under the terms of the GNU General Public
+ * License version 2, as published by the Free Software Foundation, and
+ * may be copied, distributed, and modified under those terms.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ */
+
+struct harmony_audio_platform_data {
+ int gpio_spkr_en;
+};