Merge branch 'upstream' of git://ftp.linux-mips.org/pub/scm/upstream-linus

1 files changed, 33 insertions, 0 deletions

diff --git a/arch/mips/jazz/Kconfig b/arch/mips/jazz/Kconfig
new file mode 100644
index 000000000000..1f372b0d2559
--- /dev/null
+++ b/arch/mips/jazz/Kconfig
@@ -0,0 +1,33 @@
+config ACER_PICA_61
+        bool "Support for Acer PICA 1 chipset (EXPERIMENTAL)"
+        depends on MACH_JAZZ && EXPERIMENTAL
+        select DMA_NONCOHERENT
+        select SYS_SUPPORTS_LITTLE_ENDIAN
+        help
+          This is a machine with a R4400 133/150 MHz CPU. To compile a Linux
+          kernel that runs on these, say Y here. For details about Linux on
+          the MIPS architecture, check out the Linux/MIPS FAQ on the WWW at
+          <http://www.linux-mips.org/>.
+
+config MIPS_MAGNUM_4000
+        bool "Support for MIPS Magnum 4000"
+        depends on MACH_JAZZ
+        select DMA_NONCOHERENT
+        select SYS_SUPPORTS_BIG_ENDIAN if EXPERIMENTAL
+        select SYS_SUPPORTS_LITTLE_ENDIAN
+        help
+          This is a machine with a R4000 100 MHz CPU. To compile a Linux
+          kernel that runs on these, say Y here. For details about Linux on
+          the MIPS architecture, check out the Linux/MIPS FAQ on the WWW at
+          <http://www.linux-mips.org/>.
+
+config OLIVETTI_M700
+        bool "Support for Olivetti M700-10"
+        depends on MACH_JAZZ
+        select DMA_NONCOHERENT
+        select SYS_SUPPORTS_LITTLE_ENDIAN
+        help
+          This is a machine with a R4000 100 MHz CPU. To compile a Linux
+          kernel that runs on these, say Y here. For details about Linux on
+          the MIPS architecture, check out the Linux/MIPS FAQ on the WWW at
+          <http://www.linux-mips.org/>.