Merge branch 'perf/urgent' into perf/core, to resolve a conflict

[sfrench/cifs-2.6.git] / arch / mips / include / asm / Kbuild

diff --git a/arch/mips/include/asm/Kbuild b/arch/mips/include/asm/Kbuild
index 1f8546081d2068f3adaef34892354b9e6fb2119f..40ec4ca3f946a9238afa6e0edd25c0440f86a36b 100644 (file)
--- a/arch/mips/include/asm/Kbuild
+++ b/arch/mips/include/asm/Kbuild
@@ -16,6 +16,5 @@ generic-y += sections.h
 generic-y += segment.h
 generic-y += serial.h
 generic-y += trace_clock.h
-generic-y += ucontext.h
 generic-y += user.h
 generic-y += xor.h