summaryrefslogtreecommitdiffstats
path: root/arch/frv/include/asm
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2012-07-30 11:24:53 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2012-07-30 11:24:53 -0700
commit637e49ae4f5b4a82b418dae8435e16132b298b7e (patch)
tree515d377c34f540ebc92150cb1bbae78254de79b9 /arch/frv/include/asm
parentf6774cbcad7aa21ac0d4fc92a5e4deae901f6534 (diff)
parent459dac82b587cc4afe6e04b43c8e8b25e78bda15 (diff)
downloadlinux-637e49ae4f5b4a82b418dae8435e16132b298b7e.tar.gz
linux-637e49ae4f5b4a82b418dae8435e16132b298b7e.tar.bz2
linux-637e49ae4f5b4a82b418dae8435e16132b298b7e.zip
Merge branch 'trivial' of git://git.kernel.org/pub/scm/linux/kernel/git/mmarek/kbuild
Pull treewide kbuild cleanup from Michal Marek: "Paul Bolle did a cleanup of <asm/*.h> headers in various architectures. Because the patch touch several architectures at once, it was easiest for me to apply them to the kbuild tree." * 'trivial' of git://git.kernel.org/pub/scm/linux/kernel/git/mmarek/kbuild: Remove useless wrappers of asm-generic/rmap.h Remove useless wrappers of asm-generic/ipc.h Remove useless wrappers of asm-generic/cpumask.h
Diffstat (limited to 'arch/frv/include/asm')
-rw-r--r--arch/frv/include/asm/cpumask.h6
1 files changed, 0 insertions, 6 deletions
diff --git a/arch/frv/include/asm/cpumask.h b/arch/frv/include/asm/cpumask.h
deleted file mode 100644
index d999c20c84d2..000000000000
--- a/arch/frv/include/asm/cpumask.h
+++ /dev/null
@@ -1,6 +0,0 @@
-#ifndef _ASM_CPUMASK_H
-#define _ASM_CPUMASK_H
-
-#include <asm-generic/cpumask.h>
-
-#endif /* _ASM_CPUMASK_H */