diff options
| author | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2009-03-29 23:04:53 -0400 |
|---|---|---|
| committer | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2009-03-29 23:04:53 -0400 |
| commit | 9ff9a26b786c35ee8d2a66222924a807ec851a9f (patch) | |
| tree | db432a17bccca1ca2c16907f0ee83ac449ed4012 /include/linux/pim.h | |
| parent | 0a3108beea9143225119d5e7c72a8e2c64f3eb7d (diff) | |
| parent | 0d34fb8e93ceba7b6dad0062dbb4a0813bacd75b (diff) | |
Merge commit 'origin/master' into next
Manual merge of:
arch/powerpc/include/asm/elf.h
drivers/i2c/busses/i2c-mpc.c
Diffstat (limited to 'include/linux/pim.h')
| -rw-r--r-- | include/linux/pim.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/include/linux/pim.h b/include/linux/pim.h index 1ba0661561a4..252bf6644c51 100644 --- a/include/linux/pim.h +++ b/include/linux/pim.h | |||
| @@ -4,14 +4,14 @@ | |||
| 4 | #include <asm/byteorder.h> | 4 | #include <asm/byteorder.h> |
| 5 | 5 | ||
| 6 | /* Message types - V1 */ | 6 | /* Message types - V1 */ |
| 7 | #define PIM_V1_VERSION __constant_htonl(0x10000000) | 7 | #define PIM_V1_VERSION cpu_to_be32(0x10000000) |
| 8 | #define PIM_V1_REGISTER 1 | 8 | #define PIM_V1_REGISTER 1 |
| 9 | 9 | ||
| 10 | /* Message types - V2 */ | 10 | /* Message types - V2 */ |
| 11 | #define PIM_VERSION 2 | 11 | #define PIM_VERSION 2 |
| 12 | #define PIM_REGISTER 1 | 12 | #define PIM_REGISTER 1 |
| 13 | 13 | ||
| 14 | #define PIM_NULL_REGISTER __constant_htonl(0x40000000) | 14 | #define PIM_NULL_REGISTER cpu_to_be32(0x40000000) |
| 15 | 15 | ||
| 16 | /* PIMv2 register message header layout (ietf-draft-idmr-pimvsm-v2-00.ps */ | 16 | /* PIMv2 register message header layout (ietf-draft-idmr-pimvsm-v2-00.ps */ |
| 17 | struct pimreghdr | 17 | struct pimreghdr |