diff options
| author | Takashi Iwai <tiwai@suse.de> | 2009-05-04 10:00:16 -0400 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2009-05-04 10:00:16 -0400 |
| commit | 3a20ac2c52b1317f5a5f0bd9cd3cbe8495ddd026 (patch) | |
| tree | 9a912f2609cefb9698b5cce09cd240bd6dbd09fb /include/linux/loop.h | |
| parent | 18cc8d8d9b74c446832336d8f6e1afb145f9431b (diff) | |
| parent | 3e5b50165fd0be080044586f43fcdd460ed27610 (diff) | |
Merge branch 'fix/pcm-jiffies-check' into fix/asoc
Diffstat (limited to 'include/linux/loop.h')
| -rw-r--r-- | include/linux/loop.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/include/linux/loop.h b/include/linux/loop.h index 46169a7b559b..40725447f5e0 100644 --- a/include/linux/loop.h +++ b/include/linux/loop.h | |||
| @@ -80,7 +80,7 @@ enum { | |||
| 80 | }; | 80 | }; |
| 81 | 81 | ||
| 82 | #include <asm/posix_types.h> /* for __kernel_old_dev_t */ | 82 | #include <asm/posix_types.h> /* for __kernel_old_dev_t */ |
| 83 | #include <asm/types.h> /* for __u64 */ | 83 | #include <linux/types.h> /* for __u64 */ |
| 84 | 84 | ||
| 85 | /* Backwards compatibility version */ | 85 | /* Backwards compatibility version */ |
| 86 | struct loop_info { | 86 | struct loop_info { |
| @@ -160,5 +160,6 @@ int loop_unregister_transfer(int number); | |||
| 160 | #define LOOP_SET_STATUS64 0x4C04 | 160 | #define LOOP_SET_STATUS64 0x4C04 |
| 161 | #define LOOP_GET_STATUS64 0x4C05 | 161 | #define LOOP_GET_STATUS64 0x4C05 |
| 162 | #define LOOP_CHANGE_FD 0x4C06 | 162 | #define LOOP_CHANGE_FD 0x4C06 |
| 163 | #define LOOP_SET_CAPACITY 0x4C07 | ||
| 163 | 164 | ||
| 164 | #endif | 165 | #endif |
