diff options
| author | Paul Mackerras <paulus@samba.org> | 2007-05-07 23:37:51 -0400 |
|---|---|---|
| committer | Paul Mackerras <paulus@samba.org> | 2007-05-07 23:37:51 -0400 |
| commit | 02bbc0f09c90cefdb2837605c96a66c5ce4ba2e1 (patch) | |
| tree | 04ef573cd4de095c500c9fc3477f4278c0b36300 /drivers/ide/pci/pdc202xx_new.c | |
| parent | 7487a2245b8841c77ba9db406cf99a483b9334e9 (diff) | |
| parent | 5b94f675f57e4ff16c8fda09088d7480a84dcd91 (diff) | |
Merge branch 'linux-2.6'
Diffstat (limited to 'drivers/ide/pci/pdc202xx_new.c')
| -rw-r--r-- | drivers/ide/pci/pdc202xx_new.c | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/drivers/ide/pci/pdc202xx_new.c b/drivers/ide/pci/pdc202xx_new.c index ae20fb3f6cbc..2cdd629c653d 100644 --- a/drivers/ide/pci/pdc202xx_new.c +++ b/drivers/ide/pci/pdc202xx_new.c | |||
| @@ -255,9 +255,6 @@ static int config_chipset_for_dma(ide_drive_t *drive) | |||
| 255 | printk(KERN_WARNING "%s reduced to Ultra33 mode.\n", drive->name); | 255 | printk(KERN_WARNING "%s reduced to Ultra33 mode.\n", drive->name); |
| 256 | } | 256 | } |
| 257 | 257 | ||
| 258 | if (drive->media != ide_disk && drive->media != ide_cdrom) | ||
| 259 | return 0; | ||
| 260 | |||
| 261 | if (id->capability & 4) { | 258 | if (id->capability & 4) { |
| 262 | /* | 259 | /* |
| 263 | * Set IORDY_EN & PREFETCH_EN (this seems to have | 260 | * Set IORDY_EN & PREFETCH_EN (this seems to have |