diff options
| author | Ingo Molnar <mingo@elte.hu> | 2009-01-10 17:56:42 -0500 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2009-01-10 17:56:42 -0500 |
| commit | 1de8cd3cb9f61e854e743c7210df43db517d4832 (patch) | |
| tree | 2b69c5ba5e4094037fa04d0fcb6c4537c222cde8 /arch/xtensa/lib/checksum.S | |
| parent | 1eb1b3b65dc3e3ffcc6a60e115c085c0c11c1077 (diff) | |
| parent | 3d14bdad40315b54470cb7812293d14c8af2bf7d (diff) | |
Merge branch 'linus' into x86/cleanups
Diffstat (limited to 'arch/xtensa/lib/checksum.S')
| -rw-r--r-- | arch/xtensa/lib/checksum.S | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/xtensa/lib/checksum.S b/arch/xtensa/lib/checksum.S index 9d9cd990afa6..df397f932d0e 100644 --- a/arch/xtensa/lib/checksum.S +++ b/arch/xtensa/lib/checksum.S | |||
| @@ -16,7 +16,7 @@ | |||
| 16 | 16 | ||
| 17 | #include <asm/errno.h> | 17 | #include <asm/errno.h> |
| 18 | #include <linux/linkage.h> | 18 | #include <linux/linkage.h> |
| 19 | #include <asm/variant/core.h> | 19 | #include <variant/core.h> |
| 20 | 20 | ||
| 21 | /* | 21 | /* |
| 22 | * computes a partial checksum, e.g. for TCP/UDP fragments | 22 | * computes a partial checksum, e.g. for TCP/UDP fragments |