diff options
| author |   Takashi Iwai <tiwai@suse.de> | 2009-01-15 18:27:20 +0100 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2009-01-15 18:27:20 +0100 |
| commit | c0106d72b8d71696dbe9dc80e2c77d4ac63f7531 (patch) | |
| tree | ca96d2baecb0555e36219ed6968dc8e306e530ca /include/linux/types.h | |
| parent | Merge branch 'for-2.6.29' into for-2.6.30 (diff) | |
| parent | ASoC: Fix the power update function for snd_soc_dapm_value_mux (diff) | |
Merge branch 'topic/asoc' into next/asoc
Diffstat (limited to 'include/linux/types.h')
| -rw-r--r-- | include/linux/types.h | 13 |
1 files changed, 11 insertions, 2 deletions
diff --git a/include/linux/types.h b/include/linux/types.h index 121f349cb7ec..712ca53bc348 100644 --- a/include/linux/types.h +++ b/include/linux/types.h @@ -176,10 +176,9 @@ typedef __u16 __bitwise __le16; typedef __u16 __bitwise __be16; typedef __u32 __bitwise __le32; typedef __u32 __bitwise __be32; -#if defined(__GNUC__) typedef __u64 __bitwise __le64; typedef __u64 __bitwise __be64; -#endif + typedef __u16 __bitwise __sum16; typedef __u32 __bitwise __wsum; @@ -195,6 +194,16 @@ typedef u32 phys_addr_t; typedef phys_addr_t resource_size_t; +typedef struct { + volatile int counter; +} atomic_t; + +#ifdef CONFIG_64BIT +typedef struct { + volatile long counter; +} atomic64_t; +#endif + struct ustat { __kernel_daddr_t f_tfree; __kernel_ino_t f_tinode; |