diff options
| author | Ingo Molnar <mingo@elte.hu> | 2008-12-29 03:42:58 -0500 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2008-12-29 04:37:07 -0500 |
| commit | 0ce74d9296c971b2355c26984ad0bc538e34dd6c (patch) | |
| tree | 566d03e2a4f6b42dab9628cd82c93cd61d587467 /include/linux/kernel.h | |
| parent | 1cc4fff0b360aeffeedb7d6db5089d88dd861700 (diff) | |
| parent | 3c92ec8ae91ecf59d88c798301833d7cf83f2179 (diff) | |
Merge branch 'linus' into timers/hrtimers
Conflicts:
sound/drivers/pcsp/pcsp.c
Semantic conflict:
sound/core/hrtimer.c
Diffstat (limited to 'include/linux/kernel.h')
| -rw-r--r-- | include/linux/kernel.h | 12 |
1 files changed, 0 insertions, 12 deletions
diff --git a/include/linux/kernel.h b/include/linux/kernel.h index dc7e0d0a6474..6002ae76785c 100644 --- a/include/linux/kernel.h +++ b/include/linux/kernel.h | |||
| @@ -361,18 +361,6 @@ static inline char *pack_hex_byte(char *buf, u8 byte) | |||
| 361 | ((unsigned char *)&addr)[3] | 361 | ((unsigned char *)&addr)[3] |
| 362 | #define NIPQUAD_FMT "%u.%u.%u.%u" | 362 | #define NIPQUAD_FMT "%u.%u.%u.%u" |
| 363 | 363 | ||
| 364 | #define NIP6(addr) \ | ||
| 365 | ntohs((addr).s6_addr16[0]), \ | ||
| 366 | ntohs((addr).s6_addr16[1]), \ | ||
| 367 | ntohs((addr).s6_addr16[2]), \ | ||
| 368 | ntohs((addr).s6_addr16[3]), \ | ||
| 369 | ntohs((addr).s6_addr16[4]), \ | ||
| 370 | ntohs((addr).s6_addr16[5]), \ | ||
| 371 | ntohs((addr).s6_addr16[6]), \ | ||
| 372 | ntohs((addr).s6_addr16[7]) | ||
| 373 | #define NIP6_FMT "%04x:%04x:%04x:%04x:%04x:%04x:%04x:%04x" | ||
| 374 | #define NIP6_SEQFMT "%04x%04x%04x%04x%04x%04x%04x%04x" | ||
| 375 | |||
| 376 | #if defined(__LITTLE_ENDIAN) | 364 | #if defined(__LITTLE_ENDIAN) |
| 377 | #define HIPQUAD(addr) \ | 365 | #define HIPQUAD(addr) \ |
| 378 | ((unsigned char *)&addr)[3], \ | 366 | ((unsigned char *)&addr)[3], \ |