diff options
| author | Ingo Molnar <mingo@elte.hu> | 2009-03-28 18:05:50 -0400 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2009-03-28 18:05:50 -0400 |
| commit | b0d44c0dbbd52effb731b1c0af9afd56215c48de (patch) | |
| tree | 3237c0087d91a5390aed05689b9f610ba16fa116 /arch/xtensa/include | |
| parent | 9537a48ed4b9e4b738943d6da0a0fd4278adf905 (diff) | |
| parent | 7c730ccdc1188b97f5c8cb690906242c7ed75c22 (diff) | |
Merge branch 'linus' into core/iommu
Conflicts:
arch/x86/Kconfig
Diffstat (limited to 'arch/xtensa/include')
| -rw-r--r-- | arch/xtensa/include/asm/socket.h | 3 | ||||
| -rw-r--r-- | arch/xtensa/include/asm/swab.h | 2 |
2 files changed, 4 insertions, 1 deletions
diff --git a/arch/xtensa/include/asm/socket.h b/arch/xtensa/include/asm/socket.h index 6100682b1da2..dd1a7a4a1cea 100644 --- a/arch/xtensa/include/asm/socket.h +++ b/arch/xtensa/include/asm/socket.h | |||
| @@ -65,4 +65,7 @@ | |||
| 65 | 65 | ||
| 66 | #define SO_MARK 36 | 66 | #define SO_MARK 36 |
| 67 | 67 | ||
| 68 | #define SO_TIMESTAMPING 37 | ||
| 69 | #define SCM_TIMESTAMPING SO_TIMESTAMPING | ||
| 70 | |||
| 68 | #endif /* _XTENSA_SOCKET_H */ | 71 | #endif /* _XTENSA_SOCKET_H */ |
diff --git a/arch/xtensa/include/asm/swab.h b/arch/xtensa/include/asm/swab.h index f50b697eb601..226a39162310 100644 --- a/arch/xtensa/include/asm/swab.h +++ b/arch/xtensa/include/asm/swab.h | |||
| @@ -11,7 +11,7 @@ | |||
| 11 | #ifndef _XTENSA_SWAB_H | 11 | #ifndef _XTENSA_SWAB_H |
| 12 | #define _XTENSA_SWAB_H | 12 | #define _XTENSA_SWAB_H |
| 13 | 13 | ||
| 14 | #include <asm/types.h> | 14 | #include <linux/types.h> |
| 15 | #include <linux/compiler.h> | 15 | #include <linux/compiler.h> |
| 16 | 16 | ||
| 17 | #define __SWAB_64_THRU_32__ | 17 | #define __SWAB_64_THRU_32__ |