diff options
| author | Jens Axboe <axboe@kernel.dk> | 2014-01-21 23:18:54 -0500 |
|---|---|---|
| committer | Jens Axboe <axboe@kernel.dk> | 2014-01-21 23:18:54 -0500 |
| commit | e1803a706fbb65687657db351ff91e5c4c147125 (patch) | |
| tree | 981cc4efb597b1541ce3bc357988a4d3a8d26d0d /include/uapi | |
| parent | 12a64d2f5ee1108c77f4468fcccf730d08b290e0 (diff) | |
| parent | 7b7b68bba5ef23734c35ffb0d8d82079ed604d33 (diff) | |
Merge branch 'for-jens' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/linux-block into for-3.14/drivers
Diffstat (limited to 'include/uapi')
| -rw-r--r-- | include/uapi/linux/fd.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/include/uapi/linux/fd.h b/include/uapi/linux/fd.h index f1f3dd5981b2..84c517cbce90 100644 --- a/include/uapi/linux/fd.h +++ b/include/uapi/linux/fd.h | |||
| @@ -185,7 +185,8 @@ enum { | |||
| 185 | * to clear media change status */ | 185 | * to clear media change status */ |
| 186 | FD_UNUSED_BIT, | 186 | FD_UNUSED_BIT, |
| 187 | FD_DISK_CHANGED_BIT, /* disk has been changed since last i/o */ | 187 | FD_DISK_CHANGED_BIT, /* disk has been changed since last i/o */ |
| 188 | FD_DISK_WRITABLE_BIT /* disk is writable */ | 188 | FD_DISK_WRITABLE_BIT, /* disk is writable */ |
| 189 | FD_OPEN_SHOULD_FAIL_BIT | ||
| 189 | }; | 190 | }; |
| 190 | 191 | ||
| 191 | #define FDSETDRVPRM _IOW(2, 0x90, struct floppy_drive_params) | 192 | #define FDSETDRVPRM _IOW(2, 0x90, struct floppy_drive_params) |