diff options
| author | Russell King <rmk+kernel@arm.linux.org.uk> | 2011-05-23 14:28:04 -0400 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2011-05-23 14:28:04 -0400 |
| commit | 9a55d9752d8abfc62f1ab05ccc790d22a0c8e7c0 (patch) | |
| tree | 894bb6a3fb409c6ac5f0374f5a1f656918bc35cd /arch/arm/mach-imx/pcm037.h | |
| parent | ec19628d72cff8f80220b7cedba089074ac6a599 (diff) | |
| parent | dc7ad3b3d5f1cd0a0d16c05dd3ad3898979d261e (diff) | |
Merge branch 'devel-stable' into for-linus
Conflicts:
arch/arm/Kconfig
arch/arm/mach-ns9xxx/include/mach/uncompress.h
Diffstat (limited to 'arch/arm/mach-imx/pcm037.h')
| -rw-r--r-- | arch/arm/mach-imx/pcm037.h | 11 |
1 files changed, 11 insertions, 0 deletions
diff --git a/arch/arm/mach-imx/pcm037.h b/arch/arm/mach-imx/pcm037.h new file mode 100644 index 000000000000..d6929721a5fd --- /dev/null +++ b/arch/arm/mach-imx/pcm037.h | |||
| @@ -0,0 +1,11 @@ | |||
| 1 | #ifndef __PCM037_H__ | ||
| 2 | #define __PCM037_H__ | ||
| 3 | |||
| 4 | enum pcm037_board_variant { | ||
| 5 | PCM037_PCM970, | ||
| 6 | PCM037_EET, | ||
| 7 | }; | ||
| 8 | |||
| 9 | extern enum pcm037_board_variant pcm037_variant(void); | ||
| 10 | |||
| 11 | #endif | ||