diff options
| author | David Vrabel <david.vrabel@csr.com> | 2009-01-07 05:45:25 -0500 |
|---|---|---|
| committer | David Vrabel <david.vrabel@csr.com> | 2009-01-07 05:45:25 -0500 |
| commit | a23e66f3b8cfdedec14541e71ef29a754870a20c (patch) | |
| tree | f8ac23572982e92e6f8ae09c4039db627bdf53ee /include/linux/byteorder/big_endian.h | |
| parent | 04c470adb01c62bb9bd663cfc4875cf0a4eb01ab (diff) | |
| parent | ede6f5aea054d3fb67c78857f7abdee602302043 (diff) | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6 into for-upstream
Diffstat (limited to 'include/linux/byteorder/big_endian.h')
| -rw-r--r-- | include/linux/byteorder/big_endian.h | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/include/linux/byteorder/big_endian.h b/include/linux/byteorder/big_endian.h index 1cba3f3efe5f..3c80fd7e8b56 100644 --- a/include/linux/byteorder/big_endian.h +++ b/include/linux/byteorder/big_endian.h | |||
| @@ -9,8 +9,7 @@ | |||
| 9 | #endif | 9 | #endif |
| 10 | 10 | ||
| 11 | #include <linux/types.h> | 11 | #include <linux/types.h> |
| 12 | #include <linux/byteorder/swab.h> | 12 | #include <linux/swab.h> |
| 13 | #include <linux/byteorder/swabb.h> | ||
| 14 | 13 | ||
| 15 | #define __constant_htonl(x) ((__force __be32)(__u32)(x)) | 14 | #define __constant_htonl(x) ((__force __be32)(__u32)(x)) |
| 16 | #define __constant_ntohl(x) ((__force __u32)(__be32)(x)) | 15 | #define __constant_ntohl(x) ((__force __u32)(__be32)(x)) |