diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2011-09-10 16:58:42 -0400 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2011-09-10 16:58:42 -0400 |
| commit | 72787aa866bfa6bcbd259e7a39b2f9a2f412794e (patch) | |
| tree | 1769d854a26f444875f7cdfd9982fe494a4cff71 /include/linux/loop.h | |
| parent | ad9f6677575e80ce23cb491d5ffb7b536772552e (diff) | |
| parent | 0a072a247fa79979dd31813decb6b118d7d511fd (diff) | |
Merge branches 'tegra/board' and 'at91/board' into next/board
Diffstat (limited to 'include/linux/loop.h')
| -rw-r--r-- | include/linux/loop.h | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/include/linux/loop.h b/include/linux/loop.h index 66c194e2d9b9..683d69890119 100644 --- a/include/linux/loop.h +++ b/include/linux/loop.h | |||
| @@ -64,7 +64,6 @@ struct loop_device { | |||
| 64 | 64 | ||
| 65 | struct request_queue *lo_queue; | 65 | struct request_queue *lo_queue; |
| 66 | struct gendisk *lo_disk; | 66 | struct gendisk *lo_disk; |
| 67 | struct list_head lo_list; | ||
| 68 | }; | 67 | }; |
| 69 | 68 | ||
| 70 | #endif /* __KERNEL__ */ | 69 | #endif /* __KERNEL__ */ |
| @@ -161,4 +160,8 @@ int loop_unregister_transfer(int number); | |||
| 161 | #define LOOP_CHANGE_FD 0x4C06 | 160 | #define LOOP_CHANGE_FD 0x4C06 |
| 162 | #define LOOP_SET_CAPACITY 0x4C07 | 161 | #define LOOP_SET_CAPACITY 0x4C07 |
| 163 | 162 | ||
| 163 | /* /dev/loop-control interface */ | ||
| 164 | #define LOOP_CTL_ADD 0x4C80 | ||
| 165 | #define LOOP_CTL_REMOVE 0x4C81 | ||
| 166 | #define LOOP_CTL_GET_FREE 0x4C82 | ||
| 164 | #endif | 167 | #endif |