diff options
author | 2011-05-23 19:28:04 +0100 | |
---|---|---|
committer | 2011-05-23 19:28:04 +0100 | |
commit | 9a55d9752d8abfc62f1ab05ccc790d22a0c8e7c0 (patch) | |
tree | 894bb6a3fb409c6ac5f0374f5a1f656918bc35cd /arch/arm/mach-imx/pcm037.h | |
parent | Merge branches 'consolidate', 'ep93xx', 'fixes', 'misc', 'mmci', 'remove' and 'spear' into for-linus (diff) | |
parent | ARM: Fix generic irq chip (diff) | |
download | linux-dev-9a55d9752d8abfc62f1ab05ccc790d22a0c8e7c0.tar.xz linux-dev-9a55d9752d8abfc62f1ab05ccc790d22a0c8e7c0.zip |
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 @@ +#ifndef __PCM037_H__ +#define __PCM037_H__ + +enum pcm037_board_variant { + PCM037_PCM970, + PCM037_EET, +}; + +extern enum pcm037_board_variant pcm037_variant(void); + +#endif |