diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2009-01-07 14:56:29 -0500 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-01-07 14:56:29 -0500 |
| commit | 52fefcec97c25b15887e6a9a885ca54e7f7c0928 (patch) | |
| tree | 4898112a7fb30c20a9da3aefe9fdc7fdebda57a6 /arch/xtensa/lib/usercopy.S | |
| parent | a0e280e0f33f6c859a235fb69a875ed8f3420388 (diff) | |
| parent | 5fee325e7d2bcbebf1cb38b4ff3a7aa3744c43e3 (diff) | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/czankel/xtensa-2.6
* git://git.kernel.org/pub/scm/linux/kernel/git/czankel/xtensa-2.6:
xtensa: Update platform files to reflect new location of the header files.
xtensa: switch to packed struct unaligned access implementation
xtensa: Add xt2000 support files.
xtensa: move headers files to arch/xtensa/include
xtensa: use the new byteorder headers
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 a8ab1d4fe0a..46d60314bb1 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 |