diff options
| author | Ingo Molnar <mingo@elte.hu> | 2009-01-10 18:51:06 -0500 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2009-01-10 18:51:06 -0500 |
| commit | 0811a433c61e85f895018239c4466a36311cd5de (patch) | |
| tree | 276933e518e5525d24ae37b02df2db9909679260 /arch/xtensa/lib/usercopy.S | |
| parent | c299030765292434b73572f9bcfe84951ff06614 (diff) | |
| parent | 3d14bdad40315b54470cb7812293d14c8af2bf7d (diff) | |
Merge branch 'linus' into core/iommu
Diffstat (limited to 'arch/xtensa/lib/usercopy.S')
| -rw-r--r-- | arch/xtensa/lib/usercopy.S | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/xtensa/lib/usercopy.S b/arch/xtensa/lib/usercopy.S index a8ab1d4fe0ae..46d60314bb16 100644 --- a/arch/xtensa/lib/usercopy.S +++ b/arch/xtensa/lib/usercopy.S | |||
| @@ -53,7 +53,7 @@ | |||
| 53 | * a11/ original length | 53 | * a11/ original length |
| 54 | */ | 54 | */ |
| 55 | 55 | ||
| 56 | #include <asm/variant/core.h> | 56 | #include <variant/core.h> |
| 57 | 57 | ||
| 58 | #ifdef __XTENSA_EB__ | 58 | #ifdef __XTENSA_EB__ |
| 59 | #define ALIGN(R, W0, W1) src R, W0, W1 | 59 | #define ALIGN(R, W0, W1) src R, W0, W1 |