From 2db1f97299131ecd121e32b6d2fc88ae4802bf86 Mon Sep 17 00:00:00 2001 From: Mike Frysinger <vapier@gentoo.org> Date: Fri, 19 Aug 2011 23:51:52 -0400 Subject: [PATCH] Blackfin: merge asm/mutex.h into kbuild too This header was being rewritten while the asm-generic kbuild support was in flight, so it missed out on the update. Punt the stub and use the kbuild now that everything has settled. Signed-off-by: Mike Frysinger <vapier@gentoo.org> --- arch/blackfin/include/asm/Kbuild | 1 + arch/blackfin/include/asm/mutex.h | 1 - 2 files changed, 1 insertion(+), 1 deletion(-) delete mode 100644 arch/blackfin/include/asm/mutex.h diff --git a/arch/blackfin/include/asm/Kbuild b/arch/blackfin/include/asm/Kbuild index 7a075eaf6041..5a0625aad6a0 100644 --- a/arch/blackfin/include/asm/Kbuild +++ b/arch/blackfin/include/asm/Kbuild @@ -21,6 +21,7 @@ generic-y += local64.h generic-y += local.h generic-y += mman.h generic-y += msgbuf.h +generic-y += mutex.h generic-y += param.h generic-y += percpu.h generic-y += pgalloc.h diff --git a/arch/blackfin/include/asm/mutex.h b/arch/blackfin/include/asm/mutex.h deleted file mode 100644 index ff6101aa2c71..000000000000 --- a/arch/blackfin/include/asm/mutex.h +++ /dev/null @@ -1 +0,0 @@ -#include <asm-generic/mutex-dec.h> -- 2.34.1