diff options
author | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2009-03-24 03:38:30 +0100 |
---|---|---|
committer | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2009-03-24 03:38:30 +0100 |
commit | 9e41d9597e7825ec20d690013d32bcec5f3fe16a (patch) | |
tree | ac6fea59e9a4a1c2183d6bbd6ffa760680673afb /arch/mips/emma/Kconfig | |
parent | Merge commit 'gcl/next' into next (diff) | |
parent | Linux 2.6.29 (diff) | |
download | linux-9e41d9597e7825ec20d690013d32bcec5f3fe16a.tar.xz linux-9e41d9597e7825ec20d690013d32bcec5f3fe16a.zip |
Merge commit 'origin/master' into next
Diffstat (limited to 'arch/mips/emma/Kconfig')
-rw-r--r-- | arch/mips/emma/Kconfig | 29 |
1 files changed, 0 insertions, 29 deletions
diff --git a/arch/mips/emma/Kconfig b/arch/mips/emma/Kconfig deleted file mode 100644 index 9669c72123c9..000000000000 --- a/arch/mips/emma/Kconfig +++ /dev/null @@ -1,29 +0,0 @@ -choice - prompt "Machine type" - depends on MACH_EMMA - default NEC_MARKEINS - -config NEC_MARKEINS - bool "NEC EMMA2RH Mark-eins board" - select SOC_EMMA2RH - select HW_HAS_PCI - help - This enables support for the NEC Electronics Mark-eins boards. - -endchoice - -config SOC_EMMA2RH - bool - select SOC_EMMA - select SYS_HAS_CPU_R5500 - select SYS_SUPPORTS_32BIT_KERNEL - select SYS_SUPPORTS_64BIT_KERNEL - -config SOC_EMMA - bool - select CEVT_R4K - select CSRC_R4K - select DMA_NONCOHERENT - select IRQ_CPU - select SWAP_IO_SPACE - select SYS_SUPPORTS_BIG_ENDIAN |