diff options
| author | Paul Mackerras <paulus@samba.org> | 2006-07-31 20:37:25 -0400 |
|---|---|---|
| committer | Paul Mackerras <paulus@samba.org> | 2006-07-31 20:37:25 -0400 |
| commit | 57cad8084e0837e0f2c97da789ec9b3f36809be9 (patch) | |
| tree | e9c790afb4286f78cb08d9664f58baa7e876fe55 /arch/mips/vr41xx/Kconfig | |
| parent | cb18bd40030c879cd93fef02fd579f74dbab473d (diff) | |
| parent | 49b1e3ea19b1c95c2f012b8331ffb3b169e4c042 (diff) | |
Merge branch 'merge'
Diffstat (limited to 'arch/mips/vr41xx/Kconfig')
| -rw-r--r-- | arch/mips/vr41xx/Kconfig | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/arch/mips/vr41xx/Kconfig b/arch/mips/vr41xx/Kconfig index 6046ef23b2bf..92f41f6f934a 100644 --- a/arch/mips/vr41xx/Kconfig +++ b/arch/mips/vr41xx/Kconfig | |||
| @@ -86,9 +86,3 @@ config PCI_VR41XX | |||
| 86 | depends on MACH_VR41XX && HW_HAS_PCI | 86 | depends on MACH_VR41XX && HW_HAS_PCI |
| 87 | default y | 87 | default y |
| 88 | select PCI | 88 | select PCI |
| 89 | |||
| 90 | config VRC4173 | ||
| 91 | tristate "Add NEC VRC4173 companion chip support" | ||
| 92 | depends on MACH_VR41XX && PCI_VR41XX | ||
| 93 | help | ||
| 94 | The NEC VRC4173 is a companion chip for NEC VR4122/VR4131. | ||