diff options
| author | Len Brown <len.brown@intel.com> | 2009-04-05 02:14:15 -0400 |
|---|---|---|
| committer | Len Brown <len.brown@intel.com> | 2009-04-05 02:14:15 -0400 |
| commit | 478c6a43fcbc6c11609f8cee7c7b57223907754f (patch) | |
| tree | a7f7952099da60d33032aed6de9c0c56c9f8779e /crypto/xor.c | |
| parent | 8a3f257c704e02aee9869decd069a806b45be3f1 (diff) | |
| parent | 6bb597507f9839b13498781e481f5458aea33620 (diff) | |
Merge branch 'linus' into release
Conflicts:
arch/x86/kernel/cpu/cpufreq/longhaul.c
Signed-off-by: Len Brown <len.brown@intel.com>
Diffstat (limited to 'crypto/xor.c')
| -rw-r--r-- | crypto/xor.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/crypto/xor.c b/crypto/xor.c index b2e6db075e49..996b6ee57d9e 100644 --- a/crypto/xor.c +++ b/crypto/xor.c | |||
| @@ -18,8 +18,8 @@ | |||
| 18 | 18 | ||
| 19 | #define BH_TRACE 0 | 19 | #define BH_TRACE 0 |
| 20 | #include <linux/module.h> | 20 | #include <linux/module.h> |
| 21 | #include <linux/raid/md.h> | ||
| 22 | #include <linux/raid/xor.h> | 21 | #include <linux/raid/xor.h> |
| 22 | #include <linux/jiffies.h> | ||
| 23 | #include <asm/xor.h> | 23 | #include <asm/xor.h> |
| 24 | 24 | ||
| 25 | /* The xor routines to use. */ | 25 | /* The xor routines to use. */ |