diff options
| author | Al Viro <viro@ftp.linux.org.uk> | 2007-10-29 00:31:16 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-10-29 10:41:32 -0400 |
| commit | ca5cd877ae699e758e6f26efc11b01bf6631d427 (patch) | |
| tree | f2337ce76ab006d9705b10e8e0ed2f62487c837f /drivers/md/raid6mmx.c | |
| parent | 2a397e82c7db18019e408f953dd58dc1963a328c (diff) | |
x86 merge fallout: uml
Don't undef __i386__/__x86_64__ in uml anymore, make sure that (few) places
that required adjusting the ifdefs got those.
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'drivers/md/raid6mmx.c')
| -rw-r--r-- | drivers/md/raid6mmx.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/md/raid6mmx.c b/drivers/md/raid6mmx.c index 6181a5a3365a..d4e4a1bd70ad 100644 --- a/drivers/md/raid6mmx.c +++ b/drivers/md/raid6mmx.c | |||
| @@ -16,7 +16,7 @@ | |||
| 16 | * MMX implementation of RAID-6 syndrome functions | 16 | * MMX implementation of RAID-6 syndrome functions |
| 17 | */ | 17 | */ |
| 18 | 18 | ||
| 19 | #if defined(__i386__) | 19 | #if defined(__i386__) && !defined(__arch_um__) |
| 20 | 20 | ||
| 21 | #include "raid6.h" | 21 | #include "raid6.h" |
| 22 | #include "raid6x86.h" | 22 | #include "raid6x86.h" |