aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/ide
diff options
context:
space:
mode:
authorAlexey Dobriyan <adobriyan@gmail.com>2006-09-08 09:47:24 -0700
committerLinus Torvalds <torvalds@g5.osdl.org>2006-09-08 10:22:50 -0700
commit4495c9e5cabc82bb4ce930eb5d3dc7544f3f8389 (patch)
tree3e70a8e3d31a6665265e54f98d5f3d9554bdc547 /drivers/ide
parent[PATCH] Use the correct restart option for futex_lock_pi (diff)
downloadlinux-dev-4495c9e5cabc82bb4ce930eb5d3dc7544f3f8389.tar.xz
linux-dev-4495c9e5cabc82bb4ce930eb5d3dc7544f3f8389.zip
[PATCH] optical /proc/ide/*/media
Sergey Vlasov reported that his "FUJITSU MCC3064AP, ATAPI OPTICAL drive" pops up as UNKNOWN in /proc/ide/*/media . Closes #4145. Signed-off-by: Alexey Dobriyan <adobriyan@gmail.com> Cc: Alan Cox <alan@lxorguk.ukuu.org.uk> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'drivers/ide')
-rw-r--r--drivers/ide/ide-proc.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/ide/ide-proc.c b/drivers/ide/ide-proc.c
index c12f1b71e934..41b74b13a00c 100644
--- a/drivers/ide/ide-proc.c
+++ b/drivers/ide/ide-proc.c
@@ -376,6 +376,8 @@ static int proc_ide_read_media
break;
case ide_floppy:media = "floppy\n";
break;
+ case ide_optical:media = "optical\n";
+ break;
default: media = "UNKNOWN\n";
break;
}