diff options
| author | Jeff Garzik <jgarzik@pobox.com> | 2005-12-06 04:14:25 -0500 |
|---|---|---|
| committer | Jeff Garzik <jgarzik@pobox.com> | 2005-12-06 04:14:25 -0500 |
| commit | 6cf5bcaaf9a92225017f7a3f1a630f6b5147ad4a (patch) | |
| tree | bf5fead8ac5333346b17d34a1d2f8f9d5dc608be /arch/mips/Kconfig | |
| parent | 6fc88198961141c2d9d34cde0855fb2e85ea3382 (diff) | |
| parent | 436b0f76f2cee6617f27a649637766628909dd5d (diff) | |
Merge branch 'master'
Diffstat (limited to 'arch/mips/Kconfig')
| -rw-r--r-- | arch/mips/Kconfig | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/mips/Kconfig b/arch/mips/Kconfig index e380a8322a9..b50be449d3f 100644 --- a/arch/mips/Kconfig +++ b/arch/mips/Kconfig @@ -6,8 +6,6 @@ config MIPS mainmenu "Linux/MIPS Kernel Configuration" -source "init/Kconfig" - menu "Machine selection" choice @@ -1643,6 +1641,8 @@ config RWSEM_GENERIC_SPINLOCK bool default y +source "init/Kconfig" + menu "Bus options (PCI, PCMCIA, EISA, ISA, TC)" config HW_HAS_EISA |