summaryrefslogtreecommitdiffstats
path: root/arch/arm
diff options
context:
space:
mode:
authorTakashi Iwai <tiwai@suse.de>2008-12-25 11:40:25 +0100
committerTakashi Iwai <tiwai@suse.de>2008-12-25 11:40:25 +0100
commit5c8261e44eaebbc91f9fc1bbd3f3167e91a50a57 (patch)
tree6b932687edc73c07e544ccba3f0130fdb257d902 /arch/arm
parentfacef8685b3ff95c01c33d9d836401d0dd26211d (diff)
parent472346da9cc4231bec03ff2032e0d5fd4037232c (diff)
downloadblackbird-op-linux-5c8261e44eaebbc91f9fc1bbd3f3167e91a50a57.tar.gz
blackbird-op-linux-5c8261e44eaebbc91f9fc1bbd3f3167e91a50a57.zip
Merge branch 'topic/asoc' into to-push
Diffstat (limited to 'arch/arm')
-rw-r--r--arch/arm/mach-pxa/include/mach/palmasoc.h13
1 files changed, 13 insertions, 0 deletions
diff --git a/arch/arm/mach-pxa/include/mach/palmasoc.h b/arch/arm/mach-pxa/include/mach/palmasoc.h
new file mode 100644
index 000000000000..6c4b1f7de20a
--- /dev/null
+++ b/arch/arm/mach-pxa/include/mach/palmasoc.h
@@ -0,0 +1,13 @@
+#ifndef _INCLUDE_PALMASOC_H_
+#define _INCLUDE_PALMASOC_H_
+struct palm27x_asoc_info {
+ int jack_gpio;
+};
+
+#ifdef CONFIG_SND_PXA2XX_SOC_PALM27X
+void __init palm27x_asoc_set_pdata(struct palm27x_asoc_info *data);
+#else
+static inline void palm27x_asoc_set_pdata(struct palm27x_asoc_info *data) {}
+#endif
+
+#endif
OpenPOWER on IntegriCloud