diff options
| author | Jens Axboe | 2014-01-22 05:18:54 +0100 |
|---|---|---|
| committer | Jens Axboe | 2014-01-22 05:18:54 +0100 |
| commit | e1803a706fbb65687657db351ff91e5c4c147125 (patch) | |
| tree | 981cc4efb597b1541ce3bc357988a4d3a8d26d0d /include/uapi | |
| parent | drivers/block/loop.c: fix comment typo in loop_config_discard (diff) | |
| parent | floppy: bail out in open() if drive is not responding to block0 read (diff) | |
| download | kernel-qcow2-linux-e1803a706fbb65687657db351ff91e5c4c147125.tar.gz kernel-qcow2-linux-e1803a706fbb65687657db351ff91e5c4c147125.tar.xz kernel-qcow2-linux-e1803a706fbb65687657db351ff91e5c4c147125.zip | |
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 { * to clear media change status */ FD_UNUSED_BIT, FD_DISK_CHANGED_BIT, /* disk has been changed since last i/o */ - FD_DISK_WRITABLE_BIT /* disk is writable */ + FD_DISK_WRITABLE_BIT, /* disk is writable */ + FD_OPEN_SHOULD_FAIL_BIT }; #define FDSETDRVPRM _IOW(2, 0x90, struct floppy_drive_params) |