diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2008-10-06 17:27:57 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2008-10-06 17:27:57 -0400 |
| commit | f1ea7254726d25a333056619ec6b1a8ee1b7358d (patch) | |
| tree | ad0a6307890595172406fda45ec763f7a6bb8686 /include | |
| parent | ba9b0c11285bcdaa3243c4123e924094b626c740 (diff) | |
| parent | ca09a237b8c6b053e101a4a83bc30d2c48435bd5 (diff) | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/bart/ide-2.6
* git://git.kernel.org/pub/scm/linux/kernel/git/bart/ide-2.6:
ide: workaround for bogus gcc warning in ide_sysfs_register_port()
ide-cd: Optiarc DVD RW AD-7200A does play audio
IDE: Fix platform device registration in Swarm IDE driver (v2)
ide-dma: fix ide_build_dmatable() for TRM290
ide-cd: temporary tray close fix
Diffstat (limited to 'include')
| -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 { | |||
| 366 | /* Currently on a filemark */ | 366 | /* Currently on a filemark */ |
| 367 | IDE_AFLAG_FILEMARK = (1 << 25), | 367 | IDE_AFLAG_FILEMARK = (1 << 25), |
| 368 | /* 0 = no tape is loaded, so we don't rewind after ejecting */ | 368 | /* 0 = no tape is loaded, so we don't rewind after ejecting */ |
| 369 | IDE_AFLAG_MEDIUM_PRESENT = (1 << 26) | 369 | IDE_AFLAG_MEDIUM_PRESENT = (1 << 26), |
| 370 | |||
| 371 | IDE_AFLAG_NO_AUTOCLOSE = (1 << 27), | ||
| 370 | }; | 372 | }; |
| 371 | 373 | ||
| 372 | struct ide_drive_s { | 374 | struct ide_drive_s { |