Merge tag 'v3.8-rc2' into next

[deliverable/linux.git] / lib / raid6 / sse1.c

diff --git a/lib/raid6/sse1.c b/lib/raid6/sse1.c
index 10dd91948c07900f8811248da682fc30767cc1fc..f7629713944505e575e2d2746c62ebaef3ca6946 100644 (file)
--- a/lib/raid6/sse1.c
+++ b/lib/raid6/sse1.c
@@ -21,7 +21,7 @@
  * worthwhile as a separate implementation.
  */
 
-#if defined(__i386__) && !defined(__arch_um__)
+#ifdef CONFIG_X86_32
 
 #include <linux/raid/pq.h>
 #include "x86.h"