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/memset.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/memset.S')
| -rw-r--r-- | arch/xtensa/lib/memset.S | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/xtensa/lib/memset.S b/arch/xtensa/lib/memset.S index 56a17495b2db..10b8c400f175 100644 --- a/arch/xtensa/lib/memset.S +++ b/arch/xtensa/lib/memset.S | |||
| @@ -11,7 +11,7 @@ | |||
| 11 | * Copyright (C) 2002 Tensilica Inc. | 11 | * Copyright (C) 2002 Tensilica Inc. |
| 12 | */ | 12 | */ |
| 13 | 13 | ||
| 14 | #include <asm/variant/core.h> | 14 | #include <variant/core.h> |
| 15 | 15 | ||
| 16 | /* | 16 | /* |
| 17 | * void *memset(void *dst, int c, size_t length) | 17 | * void *memset(void *dst, int c, size_t length) |