diff options
author | Ingo Molnar <mingo@elte.hu> | 2008-10-09 00:17:25 +0200 |
---|---|---|
committer | Ingo Molnar <mingo@elte.hu> | 2008-10-09 00:17:25 +0200 |
commit | cdbb92b31d3c465aa96bd09f2d42c39b87b32bee (patch) | |
tree | 370e29681529882d7e4c766a19f0612885583464 /include/linux/ide.h | |
parent | 2ec2b482b10a1ed3493c224f1893cddd3d33833b (diff) | |
parent | 69849375d6b13e94d08cdc94b49b11fbab454a0e (diff) | |
download | blackbird-op-linux-cdbb92b31d3c465aa96bd09f2d42c39b87b32bee.tar.gz blackbird-op-linux-cdbb92b31d3c465aa96bd09f2d42c39b87b32bee.zip |
Merge branch 'linus' into core/rcu
Diffstat (limited to 'include/linux/ide.h')
-rw-r--r-- | include/linux/ide.h | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/include/linux/ide.h b/include/linux/ide.h index 1524829f73f2..6514db8fd2e4 100644 --- a/include/linux/ide.h +++ b/include/linux/ide.h @@ -366,7 +366,9 @@ enum { /* Currently on a filemark */ IDE_AFLAG_FILEMARK = (1 << 25), /* 0 = no tape is loaded, so we don't rewind after ejecting */ - IDE_AFLAG_MEDIUM_PRESENT = (1 << 26) + IDE_AFLAG_MEDIUM_PRESENT = (1 << 26), + + IDE_AFLAG_NO_AUTOCLOSE = (1 << 27), }; struct ide_drive_s { |