diff options
| author | Dave Airlie <airlied@starflyer.(none)> | 2006-01-03 02:18:01 -0500 |
|---|---|---|
| committer | Dave Airlie <airlied@linux.ie> | 2006-01-03 02:18:01 -0500 |
| commit | 97f2aab6698f3ab2552c41c1024a65ffd0763a6d (patch) | |
| tree | bb6e3b2949459f54f884c710fc74d40eef00d834 /drivers/ide/ide-cd.h | |
| parent | d985c1088146607532093d9eaaaf99758f6a4d21 (diff) | |
| parent | 88026842b0a760145aa71d69e74fbc9ec118ca44 (diff) | |
drm: merge in Linus mainline
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. */ |