Merge branches 'release', 'ejd', 'sony' and 'wmi' into release

[~andy/linux] / drivers / md / raid6mmx.c

diff --git a/drivers/md/raid6mmx.c b/drivers/md/raid6mmx.c
index 6181a5a3365a198d3aad83b52f6c7e09a4d5aad3..d4e4a1bd70ad2f0841a8dd4036a167dfd1e9a3c0 100644 (file)
--- a/drivers/md/raid6mmx.c
+++ b/drivers/md/raid6mmx.c
@@ -16,7 +16,7 @@
  * MMX implementation of RAID-6 syndrome functions
  */
 
-#if defined(__i386__)
+#if defined(__i386__) && !defined(__arch_um__)
 
 #include "raid6.h"
 #include "raid6x86.h"