diff options
Diffstat (limited to 'drivers/ide/pci/trm290.c')
-rw-r--r-- | drivers/ide/pci/trm290.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/drivers/ide/pci/trm290.c b/drivers/ide/pci/trm290.c index dc4f4e298e00..e3d943ada7b0 100644 --- a/drivers/ide/pci/trm290.c +++ b/drivers/ide/pci/trm290.c | |||
@@ -292,9 +292,6 @@ static void __devinit init_hwif_trm290(ide_hwif_t *hwif) | |||
292 | hwif->ide_dma_test_irq = &trm290_ide_dma_test_irq; | 292 | hwif->ide_dma_test_irq = &trm290_ide_dma_test_irq; |
293 | 293 | ||
294 | hwif->selectproc = &trm290_selectproc; | 294 | hwif->selectproc = &trm290_selectproc; |
295 | hwif->autodma = 0; /* play it safe for now */ | ||
296 | hwif->drives[0].autodma = hwif->autodma; | ||
297 | hwif->drives[1].autodma = hwif->autodma; | ||
298 | #if 1 | 295 | #if 1 |
299 | { | 296 | { |
300 | /* | 297 | /* |
@@ -329,6 +326,9 @@ static ide_pci_device_t trm290_chipset __devinitdata = { | |||
329 | .init_hwif = init_hwif_trm290, | 326 | .init_hwif = init_hwif_trm290, |
330 | .autodma = NOAUTODMA, | 327 | .autodma = NOAUTODMA, |
331 | .bootable = ON_BOARD, | 328 | .bootable = ON_BOARD, |
329 | #if 0 /* play it safe for now */ | ||
330 | .host_flags = IDE_HFLAG_TRUST_BIOS_FOR_DMA, | ||
331 | #endif | ||
332 | }; | 332 | }; |
333 | 333 | ||
334 | static int __devinit trm290_init_one(struct pci_dev *dev, const struct pci_device_id *id) | 334 | static int __devinit trm290_init_one(struct pci_dev *dev, const struct pci_device_id *id) |
@@ -336,8 +336,8 @@ static int __devinit trm290_init_one(struct pci_dev *dev, const struct pci_devic | |||
336 | return ide_setup_pci_device(dev, &trm290_chipset); | 336 | return ide_setup_pci_device(dev, &trm290_chipset); |
337 | } | 337 | } |
338 | 338 | ||
339 | static struct pci_device_id trm290_pci_tbl[] = { | 339 | static const struct pci_device_id trm290_pci_tbl[] = { |
340 | { PCI_VENDOR_ID_TEKRAM, PCI_DEVICE_ID_TEKRAM_DC290, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0}, | 340 | { PCI_VDEVICE(TEKRAM, PCI_DEVICE_ID_TEKRAM_DC290), 0 }, |
341 | { 0, }, | 341 | { 0, }, |
342 | }; | 342 | }; |
343 | MODULE_DEVICE_TABLE(pci, trm290_pci_tbl); | 343 | MODULE_DEVICE_TABLE(pci, trm290_pci_tbl); |