diff --git a/[refs] b/[refs] index 68be4b323beb..8b8b143ed3de 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: c52399bece85cd4b157dd772e9f20551f9f18d2f +refs/heads/master: 237e5a3443e5531336b880bbaf3e7bac110330f7 diff --git a/trunk/arch/mips/Kconfig b/trunk/arch/mips/Kconfig index 023aa2d46503..09b1287a92ce 100644 --- a/trunk/arch/mips/Kconfig +++ b/trunk/arch/mips/Kconfig @@ -1966,10 +1966,6 @@ config SECCOMP endmenu -config RWSEM_GENERIC_SPINLOCK - bool - default y - config LOCKDEP_SUPPORT bool default y