diff options
| author | Jody McIntyre <scjody@modernduck.com> | 2005-12-16 17:10:35 -0500 |
|---|---|---|
| committer | Jody McIntyre <scjody@modernduck.com> | 2005-12-16 17:10:35 -0500 |
| commit | 16e842a62a8ffcc2e51def6ef9fd6e0926539bc5 (patch) | |
| tree | 2cf6c23ab195e68712bca51351c1d37ed950c55d /drivers/ide/ide-cd.h | |
| parent | 525352eb6d355bef6adf597252fc6d04f2dbe66c (diff) | |
| parent | 42245e65f356ed54fdf7a1f9a0095e0bc40f73a3 (diff) | |
Merge with http://kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6.git
Diffstat (limited to 'drivers/ide/ide-cd.h')
| -rw-r--r-- | drivers/ide/ide-cd.h | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/drivers/ide/ide-cd.h b/drivers/ide/ide-cd.h index 7ca3e5afc665..ad1f2ed14a37 100644 --- a/drivers/ide/ide-cd.h +++ b/drivers/ide/ide-cd.h | |||
| @@ -480,7 +480,6 @@ struct cdrom_info { | |||
| 480 | 480 | ||
| 481 | struct request request_sense_request; | 481 | struct request request_sense_request; |
| 482 | int dma; | 482 | int dma; |
| 483 | int cmd; | ||
| 484 | unsigned long last_block; | 483 | unsigned long last_block; |
| 485 | unsigned long start_seek; | 484 | unsigned long start_seek; |
| 486 | /* Buffer to hold mechanism status and changer slot table. */ | 485 | /* Buffer to hold mechanism status and changer slot table. */ |