diff options
Diffstat (limited to 'drivers/ide/pci/trm290.c')
-rw-r--r-- | drivers/ide/pci/trm290.c | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/drivers/ide/pci/trm290.c b/drivers/ide/pci/trm290.c index e3d943ada7b0..5011ba22e36c 100644 --- a/drivers/ide/pci/trm290.c +++ b/drivers/ide/pci/trm290.c | |||
@@ -250,8 +250,6 @@ static void __devinit init_hwif_trm290(ide_hwif_t *hwif) | |||
250 | u8 reg = 0; | 250 | u8 reg = 0; |
251 | struct pci_dev *dev = hwif->pci_dev; | 251 | struct pci_dev *dev = hwif->pci_dev; |
252 | 252 | ||
253 | hwif->no_lba48 = 1; | ||
254 | hwif->chipset = ide_trm290; | ||
255 | cfgbase = pci_resource_start(dev, 4); | 253 | cfgbase = pci_resource_start(dev, 4); |
256 | if ((dev->class & 5) && cfgbase) { | 254 | if ((dev->class & 5) && cfgbase) { |
257 | hwif->config_data = cfgbase; | 255 | hwif->config_data = cfgbase; |
@@ -321,14 +319,17 @@ static void __devinit init_hwif_trm290(ide_hwif_t *hwif) | |||
321 | #endif | 319 | #endif |
322 | } | 320 | } |
323 | 321 | ||
324 | static ide_pci_device_t trm290_chipset __devinitdata = { | 322 | static const struct ide_port_info trm290_chipset __devinitdata = { |
325 | .name = "TRM290", | 323 | .name = "TRM290", |
326 | .init_hwif = init_hwif_trm290, | 324 | .init_hwif = init_hwif_trm290, |
327 | .autodma = NOAUTODMA, | 325 | .chipset = ide_trm290, |
328 | .bootable = ON_BOARD, | 326 | .host_flags = IDE_HFLAG_NO_ATAPI_DMA | |
329 | #if 0 /* play it safe for now */ | 327 | #if 0 /* play it safe for now */ |
330 | .host_flags = IDE_HFLAG_TRUST_BIOS_FOR_DMA, | 328 | IDE_HFLAG_TRUST_BIOS_FOR_DMA | |
331 | #endif | 329 | #endif |
330 | IDE_HFLAG_NO_AUTODMA | | ||
331 | IDE_HFLAG_BOOTABLE | | ||
332 | IDE_HFLAG_NO_LBA48, | ||
332 | }; | 333 | }; |
333 | 334 | ||
334 | static int __devinit trm290_init_one(struct pci_dev *dev, const struct pci_device_id *id) | 335 | static int __devinit trm290_init_one(struct pci_dev *dev, const struct pci_device_id *id) |