diff options
| author | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-04-11 04:22:31 +0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-04-11 04:22:31 +0400 |
| commit | 8bd51cce98aa80ff8b56d34a0e48316c5f887818 (patch) | |
| tree | 76735fa7f5767fa379f30399a9bd048a3bbf3fc3 /drivers/ide/ide.c | |
| parent | 9631eb0bc18bc1fd1cc84e535260d67ed6a36865 (diff) | |
| parent | a7a832de9e9624bcf069a5369c3c38ba2f44d460 (diff) | |
| download | linux-8bd51cce98aa80ff8b56d34a0e48316c5f887818.tar.xz | |
Merge master.kernel.org:/pub/scm/linux/kernel/git/bart/ide-2.6
* master.kernel.org:/pub/scm/linux/kernel/git/bart/ide-2.6:
ide: add "optical" to sysfs "media" attribute
ide: ugly messages trying to open CD drive with no media present
ide: correctly prevent IDE timer expiry function to run if request was already handled
Diffstat (limited to 'drivers/ide/ide.c')
| -rw-r--r-- | drivers/ide/ide.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/ide/ide.c b/drivers/ide/ide.c index a6f098fda884..ae5bf2be6f52 100644 --- a/drivers/ide/ide.c +++ b/drivers/ide/ide.c @@ -1962,6 +1962,8 @@ static char *media_string(ide_drive_t *drive) return "tape"; case ide_floppy: return "floppy"; + case ide_optical: + return "optical"; default: return "UNKNOWN"; } |