diff options
| author | Steven Whitehouse <swhiteho@redhat.com> | 2006-07-17 09:25:26 -0400 |
|---|---|---|
| committer | Steven Whitehouse <swhiteho@redhat.com> | 2006-07-17 09:25:26 -0400 |
| commit | 4bf311ddfbffe12d41ad1a3c311ab727db6f72cb (patch) | |
| tree | 9d19a2774e83637d86dc876f3af22af1dacf0bec /arch/mips/vr41xx/Kconfig | |
| parent | 597d0cae0f99f62501e229bed50e8149604015bb (diff) | |
| parent | 82d6897fefca6206bca7153805b4c5359ce97fc4 (diff) | |
Merge branch 'master'
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. | ||