diff options
| author | David S. Miller <davem@davemloft.net> | 2011-04-11 16:44:25 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2011-04-11 16:44:25 -0400 |
| commit | 1c01a80cfec6f806246f31ff2680cd3639b30e67 (patch) | |
| tree | 0b554aad2ec1da71ecf6339d4ba51617bfe1dc3c /drivers/cdrom/cdrom.c | |
| parent | c44d79950b2daa1025e62eede73e4e4a274d1ef3 (diff) | |
| parent | 4a9f65f6304a00f6473e83b19c1e83caa1e42530 (diff) | |
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
Conflicts:
drivers/net/smsc911x.c
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 e2c48a7eccf..514dd8efaf7 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 |