diff options
| author | Linus Torvalds <torvalds@g5.osdl.org> | 2005-12-01 15:52:58 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2005-12-01 15:52:58 -0800 |
| commit | b67c26e4fcfdade157d5bd54085720e71518cccd (patch) | |
| tree | cbfcbf209abc06fc28b6c77a130985e7212879c5 /arch/mips/Kconfig | |
| parent | c6b79418a4bb0260a92a25f562047d5be7b0e7f4 (diff) | |
| parent | 80b42598eec1627084e225c575201bdd838f5b8f (diff) | |
Merge branch 'upstream' of git://ftp.linux-mips.org/pub/scm/upstream-linus
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 |