diff options
| author | James Morris <jmorris@namei.org> | 2011-04-19 07:32:41 -0400 |
|---|---|---|
| committer | James Morris <jmorris@namei.org> | 2011-04-19 07:32:41 -0400 |
| commit | d4ab4e6a23f805abb8fc3cc34525eec3788aeca1 (patch) | |
| tree | eefd82c155bc27469a85667d759cd90facf4a6e3 /drivers/cdrom/cdrom.c | |
| parent | c0fa797ae6cd02ff87c0bfe0d509368a3b45640e (diff) | |
| parent | 96fd2d57b8252e16dfacf8941f7a74a6119197f5 (diff) | |
Merge branch 'master'; commit 'v2.6.39-rc3' into next
Diffstat (limited to 'drivers/cdrom/cdrom.c')
| -rw-r--r-- | drivers/cdrom/cdrom.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/cdrom/cdrom.c b/drivers/cdrom/cdrom.c index e2c48a7eccff..514dd8efaf73 100644 --- a/drivers/cdrom/cdrom.c +++ b/drivers/cdrom/cdrom.c | |||
| @@ -30,7 +30,7 @@ | |||
| 30 | changelog for the 1.x series, David? | 30 | changelog for the 1.x series, David? |
| 31 | 31 | ||
| 32 | 2.00 Dec 2, 1997 -- Erik Andersen <andersee@debian.org> | 32 | 2.00 Dec 2, 1997 -- Erik Andersen <andersee@debian.org> |
| 33 | -- New maintainer! As David A. van Leeuwen has been too busy to activly | 33 | -- New maintainer! As David A. van Leeuwen has been too busy to actively |
| 34 | maintain and improve this driver, I am now carrying on the torch. If | 34 | maintain and improve this driver, I am now carrying on the torch. If |
| 35 | you have a problem with this driver, please feel free to contact me. | 35 | you have a problem with this driver, please feel free to contact me. |
| 36 | 36 | ||
| @@ -2520,7 +2520,7 @@ static int cdrom_ioctl_drive_status(struct cdrom_device_info *cdi, | |||
| 2520 | /* | 2520 | /* |
| 2521 | * Ok, this is where problems start. The current interface for the | 2521 | * Ok, this is where problems start. The current interface for the |
| 2522 | * CDROM_DISC_STATUS ioctl is flawed. It makes the false assumption that | 2522 | * CDROM_DISC_STATUS ioctl is flawed. It makes the false assumption that |
| 2523 | * CDs are all CDS_DATA_1 or all CDS_AUDIO, etc. Unfortunatly, while this | 2523 | * CDs are all CDS_DATA_1 or all CDS_AUDIO, etc. Unfortunately, while this |
| 2524 | * is often the case, it is also very common for CDs to have some tracks | 2524 | * is often the case, it is also very common for CDs to have some tracks |
| 2525 | * with data, and some tracks with audio. Just because I feel like it, | 2525 | * with data, and some tracks with audio. Just because I feel like it, |
| 2526 | * I declare the following to be the best way to cope. If the CD has ANY | 2526 | * I declare the following to be the best way to cope. If the CD has ANY |