diff --git a/[refs] b/[refs] index edb621b93111..0fa7f6d1d59f 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: d981733aaf970e4537bb8dee9422ee775d92e5ae +refs/heads/master: b6c3539bdd6d766cffea76698c85ebb92bf3fb12 diff --git a/trunk/arch/mips/Kconfig b/trunk/arch/mips/Kconfig index e380a8322a94..b50be449d3f5 100644 --- a/trunk/arch/mips/Kconfig +++ b/trunk/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