diff options
-rw-r--r-- | arch/mips/Kconfig | 30 | ||||
-rw-r--r-- | arch/mips/Makefile | 9 | ||||
-rw-r--r-- | drivers/char/Kconfig | 5 |
3 files changed, 22 insertions, 22 deletions
diff --git a/arch/mips/Kconfig b/arch/mips/Kconfig index 8398efdee2fa..0b0d48437129 100644 --- a/arch/mips/Kconfig +++ b/arch/mips/Kconfig | |||
@@ -102,25 +102,29 @@ config IBM_WORKPAD | |||
102 | select IRQ_CPU | 102 | select IRQ_CPU |
103 | select ISA | 103 | select ISA |
104 | 104 | ||
105 | config TANBAC_TB0226 | 105 | config TANBAC_TB022X |
106 | bool "Support for TANBAC TB0226 (Mbase)" | 106 | bool "Support for TANBAC VR4131 multichip module and TANBAC VR4131DIMM" |
107 | depends on MACH_VR41XX | 107 | depends on MACH_VR41XX |
108 | select CPU_LITTLE_ENDIAN | ||
108 | select DMA_NONCOHERENT | 109 | select DMA_NONCOHERENT |
109 | select HW_HAS_PCI | ||
110 | select IRQ_CPU | 110 | select IRQ_CPU |
111 | select HW_HAS_PCI | ||
111 | help | 112 | help |
112 | The TANBAC TB0226 (Mbase) is a MIPS-based platform manufactured by TANBAC. | 113 | The TANBAC VR4131 multichip module(TB0225) and |
113 | Please refer to <http://www.tanbac.co.jp/> about Mbase. | 114 | the TANBAC VR4131DIMM(TB0229) are MIPS-based platforms |
115 | manufactured by TANBAC. | ||
116 | Please refer to <http://www.tanbac.co.jp/> | ||
117 | about VR4131 multichip module and VR4131DIMM. | ||
114 | 118 | ||
115 | config TANBAC_TB0229 | 119 | config TANBAC_TB0226 |
116 | bool "Support for TANBAC TB0229 (VR4131DIMM)" | 120 | bool "Support for TANBAC Mbase(TB0226)" |
117 | depends on MACH_VR41XX | 121 | depends on TANBAC_TB022X |
118 | select DMA_NONCOHERENT | 122 | select PCI |
119 | select HW_HAS_PCI | 123 | select PCI_VR41XX |
120 | select IRQ_CPU | 124 | select GPIO_VR41XX |
121 | help | 125 | help |
122 | The TANBAC TB0229 (VR4131DIMM) is a MIPS-based platform manufactured by TANBAC. | 126 | The TANBAC Mbase(TB0226) is a MIPS-based platform manufactured by TANBAC. |
123 | Please refer to <http://www.tanbac.co.jp/> about VR4131DIMM. | 127 | Please refer to <http://www.tanbac.co.jp/> about Mbase. |
124 | 128 | ||
125 | config VICTOR_MPC30X | 129 | config VICTOR_MPC30X |
126 | bool "Support for Victor MP-C303/304" | 130 | bool "Support for Victor MP-C303/304" |
diff --git a/arch/mips/Makefile b/arch/mips/Makefile index c8b16e668c17..7d1d7c91b857 100644 --- a/arch/mips/Makefile +++ b/arch/mips/Makefile | |||
@@ -509,14 +509,9 @@ core-$(CONFIG_CASIO_E55) += arch/mips/vr41xx/casio-e55/ | |||
509 | load-$(CONFIG_CASIO_E55) += 0xffffffff80004000 | 509 | load-$(CONFIG_CASIO_E55) += 0xffffffff80004000 |
510 | 510 | ||
511 | # | 511 | # |
512 | # TANBAC TB0226 Mbase (VR4131) | 512 | # TANBAC VR4131 multichip module(TB0225) and TANBAC VR4131DIMM(TB0229) (VR4131) |
513 | # | 513 | # |
514 | load-$(CONFIG_TANBAC_TB0226) += 0xffffffff80000000 | 514 | load-$(CONFIG_TANBAC_TB022X) += 0xffffffff80000000 |
515 | |||
516 | # | ||
517 | # TANBAC TB0229 VR4131DIMM (VR4131) | ||
518 | # | ||
519 | load-$(CONFIG_TANBAC_TB0229) += 0xffffffff80000000 | ||
520 | 515 | ||
521 | # | 516 | # |
522 | # SGI IP22 (Indy/Indigo2) | 517 | # SGI IP22 (Indy/Indigo2) |
diff --git a/drivers/char/Kconfig b/drivers/char/Kconfig index 7333b41d4224..116a7b185999 100644 --- a/drivers/char/Kconfig +++ b/drivers/char/Kconfig | |||
@@ -842,8 +842,9 @@ config SONYPI | |||
842 | 842 | ||
843 | config TANBAC_TB0219 | 843 | config TANBAC_TB0219 |
844 | tristate "TANBAC TB0219 base board support" | 844 | tristate "TANBAC TB0219 base board support" |
845 | depends TANBAC_TB0229 | 845 | depends TANBAC_TB022X |
846 | 846 | select PCI | |
847 | select PCI_VR41XX | ||
847 | 848 | ||
848 | menu "Ftape, the floppy tape device driver" | 849 | menu "Ftape, the floppy tape device driver" |
849 | 850 | ||