summaryrefslogtreecommitdiff
path: root/arch/cris/include/asm/swab.h
diff options
context:
space:
mode:
authorIngo Molnar <mingo@elte.hu>2009-01-21 09:39:51 (GMT)
committerIngo Molnar <mingo@elte.hu>2009-01-21 09:39:51 (GMT)
commit198030782cedf25391e67e7c88b04f87a5eb6563 (patch)
tree5b7368c6bf052bcb4bb273497a57900720d36f51 /arch/cris/include/asm/swab.h
parent4ec71fa2d2c3f1040348f2604f4b8ccc833d1c2e (diff)
parent92181f190b649f7ef2b79cbf5c00f26ccc66da2a (diff)
downloadlinux-198030782cedf25391e67e7c88b04f87a5eb6563.tar.xz
Merge branch 'x86/mm' into core/percpu
Conflicts: arch/x86/mm/fault.c
Diffstat (limited to 'arch/cris/include/asm/swab.h')
-rw-r--r--arch/cris/include/asm/swab.h8
1 files changed, 8 insertions, 0 deletions
diff --git a/arch/cris/include/asm/swab.h b/arch/cris/include/asm/swab.h
new file mode 100644
index 0000000..80668e8
--- /dev/null
+++ b/arch/cris/include/asm/swab.h
@@ -0,0 +1,8 @@
+#ifndef _CRIS_SWAB_H
+#define _CRIS_SWAB_H
+
+#ifdef __KERNEL__
+#include <arch/swab.h>
+#endif /* __KERNEL__ */
+
+#endif /* _CRIS_SWAB_H */