diff options
| author | Thomas Gleixner <tglx@linutronix.de> | 2009-01-22 04:03:02 -0500 |
|---|---|---|
| committer | Thomas Gleixner <tglx@linutronix.de> | 2009-01-22 04:03:02 -0500 |
| commit | 6552ebae25ffd57574c6e72d17fce67fea08b918 (patch) | |
| tree | cde6cc932c7e47d818154b011dfd8a6997d5c18e /include/linux/loop.h | |
| parent | 749a440b2218e9937dca8c68e23e51ca4d8d37fe (diff) | |
| parent | 336f6c322d87806ef93afad6308ac65083a865e5 (diff) | |
Merge branch 'core/debugobjects' into core/urgent
Diffstat (limited to 'include/linux/loop.h')
| -rw-r--r-- | include/linux/loop.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/linux/loop.h b/include/linux/loop.h index 46169a7b559b..6ffd6db5bb0d 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 { |