diff options
author | Ingo Molnar <mingo@kernel.org> | 2015-03-13 16:20:46 +0300 |
---|---|---|
committer | Ingo Molnar <mingo@kernel.org> | 2015-03-13 16:21:04 +0300 |
commit | 56544d29c3a0e383c0d819fefc9570b2803db193 (patch) | |
tree | 4366fc0ba3f5115b8c1c9d171fa245d86e5415d0 /arch/powerpc/platforms/85xx/Kconfig | |
parent | 9261dc1de11e158a5f6b4b92c8bf1ef4a02dbf0d (diff) | |
parent | 9eccca0843205f87c00404b663188b88eb248051 (diff) | |
download | linux-56544d29c3a0e383c0d819fefc9570b2803db193.tar.xz |
Merge tag 'v4.0-rc3' into x86/build, to refresh an older tree before applying new changes
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'arch/powerpc/platforms/85xx/Kconfig')
-rw-r--r-- | arch/powerpc/platforms/85xx/Kconfig | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/arch/powerpc/platforms/85xx/Kconfig b/arch/powerpc/platforms/85xx/Kconfig index f22635a71d01..2fb4b24368a6 100644 --- a/arch/powerpc/platforms/85xx/Kconfig +++ b/arch/powerpc/platforms/85xx/Kconfig @@ -241,6 +241,12 @@ config SGY_CTS1000 help Enable this to support functionality in Servergy's CTS-1000 systems. +config MVME2500 + bool "Artesyn MVME2500" + select DEFAULT_UIMAGE + help + This option enables support for the Emerson/Artesyn MVME2500 board. + endif # PPC32 config PPC_QEMU_E500 |