Merge branch 'for-linus' into for-next

[~andy/linux] / lib / raid6 / mmx.c

diff --git a/lib/raid6/mmx.c b/lib/raid6/mmx.c
index 279347f23094e14f5044ab413fba4859e520d4d4..590c71c9e2005b407166cde2e37a0c8066c7ef0d 100644 (file)
--- a/lib/raid6/mmx.c
+++ b/lib/raid6/mmx.c
@@ -16,7 +16,7 @@
  * MMX implementation of RAID-6 syndrome functions
  */
 
-#if defined(__i386__) && !defined(__arch_um__)
+#ifdef CONFIG_X86_32
 
 #include <linux/raid/pq.h>
 #include "x86.h"