diff options
| author | Jeff Garzik <jeff@garzik.org> | 2006-09-12 12:03:21 -0400 |
|---|---|---|
| committer | Jeff Garzik <jeff@garzik.org> | 2006-09-12 12:03:21 -0400 |
| commit | 97148ba2235e334e57d05fa07045cf3e6629763c (patch) | |
| tree | a04504e7d4feb0dacfe1862a59abecaf99997f09 /drivers/ide/ide-proc.c | |
| parent | 76ff3c6e3b389a5a7692811dd456e0ff58340cac (diff) | |
| parent | 05ff0e291af086f4325bac76abad250690bbbd63 (diff) | |
Merge branch 'master' into upstream
Diffstat (limited to 'drivers/ide/ide-proc.c')
| -rw-r--r-- | drivers/ide/ide-proc.c | 2 |
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 | |||
| 376 | break; | 376 | break; |
| 377 | case ide_floppy:media = "floppy\n"; | 377 | case ide_floppy:media = "floppy\n"; |
| 378 | break; | 378 | break; |
| 379 | case ide_optical:media = "optical\n"; | ||
| 380 | break; | ||
| 379 | default: media = "UNKNOWN\n"; | 381 | default: media = "UNKNOWN\n"; |
| 380 | break; | 382 | break; |
| 381 | } | 383 | } |