diff options
| author | Russell King <rmk@dyn-67.arm.linux.org.uk> | 2009-03-28 16:29:51 -0400 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2009-03-28 16:29:51 -0400 |
| commit | ed40d0c472b136682b2fcba05f89762859c7374f (patch) | |
| tree | 076b83a26bcd63d6158463735dd34c10bbc591dc /include/mtd/jffs2-user.h | |
| parent | 9e495834e59ca9b29f1a1f63b9f5533bb022ac49 (diff) | |
| parent | 5d80f8e5a9dc9c9a94d4aeaa567e219a808b8a4a (diff) | |
Merge branch 'origin' into devel
Conflicts:
sound/soc/pxa/pxa2xx-i2s.c
Diffstat (limited to 'include/mtd/jffs2-user.h')
| -rw-r--r-- | include/mtd/jffs2-user.h | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/include/mtd/jffs2-user.h b/include/mtd/jffs2-user.h index 001685d7fa88..fa94b0eb67c1 100644 --- a/include/mtd/jffs2-user.h +++ b/include/mtd/jffs2-user.h | |||
| @@ -7,6 +7,7 @@ | |||
| 7 | 7 | ||
| 8 | /* This file is blessed for inclusion by userspace */ | 8 | /* This file is blessed for inclusion by userspace */ |
| 9 | #include <linux/jffs2.h> | 9 | #include <linux/jffs2.h> |
| 10 | #include <linux/types.h> | ||
| 10 | #include <endian.h> | 11 | #include <endian.h> |
| 11 | #include <byteswap.h> | 12 | #include <byteswap.h> |
| 12 | 13 | ||
| @@ -19,8 +20,8 @@ | |||
| 19 | 20 | ||
| 20 | extern int target_endian; | 21 | extern int target_endian; |
| 21 | 22 | ||
| 22 | #define t16(x) ({ uint16_t __b = (x); (target_endian==__BYTE_ORDER)?__b:bswap_16(__b); }) | 23 | #define t16(x) ({ __u16 __b = (x); (target_endian==__BYTE_ORDER)?__b:bswap_16(__b); }) |
| 23 | #define t32(x) ({ uint32_t __b = (x); (target_endian==__BYTE_ORDER)?__b:bswap_32(__b); }) | 24 | #define t32(x) ({ __u32 __b = (x); (target_endian==__BYTE_ORDER)?__b:bswap_32(__b); }) |
| 24 | 25 | ||
| 25 | #define cpu_to_je16(x) ((jint16_t){t16(x)}) | 26 | #define cpu_to_je16(x) ((jint16_t){t16(x)}) |
| 26 | #define cpu_to_je32(x) ((jint32_t){t32(x)}) | 27 | #define cpu_to_je32(x) ((jint32_t){t32(x)}) |