aboutsummaryrefslogtreecommitdiff
path: root/arch/arm/mach-mx3/pcm037.h
diff options
context:
space:
mode:
authorGravatar Ingo Molnar <mingo@elte.hu> 2009-08-11 14:19:09 +0200
committerGravatar Ingo Molnar <mingo@elte.hu> 2009-08-11 14:19:09 +0200
commit89034bc2c7b839702c00a704e79d112737f98be0 (patch)
treee65b1f3d4c751baa840efc81bc4734f089379eb3 /arch/arm/mach-mx3/pcm037.h
parenttracing/filters: Don't use pred on alloc failure (diff)
parentpty: fix data loss when stopped (^S/^Q) (diff)
downloadlinux-89034bc2c7b839702c00a704e79d112737f98be0.tar.gz
linux-89034bc2c7b839702c00a704e79d112737f98be0.tar.bz2
linux-89034bc2c7b839702c00a704e79d112737f98be0.zip
Merge branch 'linus' into tracing/core
Conflicts: kernel/trace/trace_events_filter.c We use the tracing/core version. Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'arch/arm/mach-mx3/pcm037.h')
-rw-r--r--arch/arm/mach-mx3/pcm037.h11
1 files changed, 11 insertions, 0 deletions
diff --git a/arch/arm/mach-mx3/pcm037.h b/arch/arm/mach-mx3/pcm037.h
new file mode 100644
index 000000000000..d6929721a5fd
--- /dev/null
+++ b/arch/arm/mach-mx3/pcm037.h
@@ -0,0 +1,11 @@
+#ifndef __PCM037_H__
+#define __PCM037_H__
+
+enum pcm037_board_variant {
+ PCM037_PCM970,
+ PCM037_EET,
+};
+
+extern enum pcm037_board_variant pcm037_variant(void);
+
+#endif