diff options
author | Mike Frysinger <vapier@gentoo.org> | 2011-08-19 23:51:52 -0400 |
---|---|---|
committer | Mike Frysinger <vapier@gentoo.org> | 2011-10-25 19:51:47 -0400 |
commit | 2db1f97299131ecd121e32b6d2fc88ae4802bf86 (patch) | |
tree | 7fefbdf4061509ec944cf72c71283fd51689d50b /arch | |
parent | e0754d83ed5bfd9b1353f293964889252da682f2 (diff) |
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>
Diffstat (limited to 'arch')
-rw-r--r-- | arch/blackfin/include/asm/Kbuild | 1 | ||||
-rw-r--r-- | arch/blackfin/include/asm/mutex.h | 1 |
2 files changed, 1 insertions, 1 deletions
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 | |||
21 | generic-y += local.h | 21 | generic-y += local.h |
22 | generic-y += mman.h | 22 | generic-y += mman.h |
23 | generic-y += msgbuf.h | 23 | generic-y += msgbuf.h |
24 | generic-y += mutex.h | ||
24 | generic-y += param.h | 25 | generic-y += param.h |
25 | generic-y += percpu.h | 26 | generic-y += percpu.h |
26 | generic-y += pgalloc.h | 27 | 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 @@ | |||
1 | #include <asm-generic/mutex-dec.h> | ||