aboutsummaryrefslogtreecommitdiff
path: root/include/asm-m68k/md.h
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2009-01-26 10:33:01 -0800
committerLinus Torvalds <torvalds@linux-foundation.org>2009-01-26 10:33:01 -0800
commitac3d266bf1bbbdd7efb6bd6760f2ee29e43bb132 (patch)
treed498e947176f4b77938034ff6c6427f9875da721 /include/asm-m68k/md.h
parent9f4863b7dc7f545bb3a01746feafdc1208e86c89 (diff)
parent49148020bcb6910ce71417bd990a5ce7017f9bd3 (diff)
Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gerg/m68knommu
* 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gerg/m68knommu: m68k,m68knommu: merge header files Resolve trivial conflict in arch/m68knommu/include/asm/Kbuild
Diffstat (limited to 'include/asm-m68k/md.h')
-rw-r--r--include/asm-m68k/md.h13
1 files changed, 0 insertions, 13 deletions
diff --git a/include/asm-m68k/md.h b/include/asm-m68k/md.h
deleted file mode 100644
index d2f78f226f3..00000000000
--- a/include/asm-m68k/md.h
+++ /dev/null
@@ -1,13 +0,0 @@
-/*
- * md.h: High speed xor_block operation for RAID4/5
- *
- */
-
-#ifndef __ASM_MD_H
-#define __ASM_MD_H
-
-/* #define HAVE_ARCH_XORBLOCK */
-
-#define MD_XORBLOCK_ALIGNMENT sizeof(long)
-
-#endif /* __ASM_MD_H */