← Back to branch summary

~ubuntu-branches/ubuntu/lucid/linux-rt/lucid

« back to all changes in this revision

Viewing changes to drivers/ide/via82cxxx.c

  • Committer: Bazaar Package Importer
  • Author(s): Luke Yelavich
  • Date: 2009-08-05 23:00:52 UTC
  • Revision ID: james.westby@ubuntu.com-20090805230052-7xedvqcyk9dnnxb2
Tags: 2.6.31-1.1
New upstream release

Show diffs side-by-side

added added

removed removed

Lines of Context:
drivers/ide/via82cxxx.c
67
67
        u8 udma_mask;
68
68
        u8 flags;
69
69
} via_isa_bridges[] = {
 
70
        { "vx855",      PCI_DEVICE_ID_VIA_VX855,    0x00, 0x2f, ATA_UDMA6, VIA_BAD_AST },
70
71
        { "vx800",      PCI_DEVICE_ID_VIA_VX800,    0x00, 0x2f, ATA_UDMA6, VIA_BAD_AST },
71
72
        { "cx700",      PCI_DEVICE_ID_VIA_CX700,    0x00, 0x2f, ATA_UDMA6, VIA_BAD_AST },
72
73
        { "vt8237s",    PCI_DEVICE_ID_VIA_8237S,    0x00, 0x2f, ATA_UDMA6, VIA_BAD_AST },
267
268
 *      and initialize its drive independent registers.
268
269
 */
269
270
 
270
 
static unsigned int init_chipset_via82cxxx(struct pci_dev *dev)
 
271
static int init_chipset_via82cxxx(struct pci_dev *dev)
271
272
{
272
273
        struct ide_host *host = pci_get_drvdata(dev);
273
274
        struct via82cxxx_dev *vdev = host->host_priv;
443
444
        if ((via_config->flags & VIA_NO_UNMASK) == 0)
444
445
                d.host_flags |= IDE_HFLAG_UNMASK_IRQS;
445
446
 
446
 
#ifdef CONFIG_PPC_CHRP
447
 
        if (machine_is(chrp) && _chrp_type == _CHRP_Pegasos)
448
 
                d.host_flags |= IDE_HFLAG_FORCE_LEGACY_IRQS;
449
 
#endif
450
 
 
451
 
#ifdef CONFIG_AMIGAONE
452
 
        if (machine_is(amigaone))
453
 
                d.host_flags |= IDE_HFLAG_FORCE_LEGACY_IRQS;
454
 
#endif
455
 
 
456
447
        d.udma_mask = via_config->udma_mask;
457
448
 
458
449
        vdev = kzalloc(sizeof(*vdev), GFP_KERNEL);
484
475
        { PCI_VDEVICE(VIA, PCI_DEVICE_ID_VIA_82C576_1),  0 },
485
476
        { PCI_VDEVICE(VIA, PCI_DEVICE_ID_VIA_82C586_1),  0 },
486
477
        { PCI_VDEVICE(VIA, PCI_DEVICE_ID_VIA_CX700_IDE), 0 },
 
478
        { PCI_VDEVICE(VIA, PCI_DEVICE_ID_VIA_VX855_IDE), 0 },
487
479
        { PCI_VDEVICE(VIA, PCI_DEVICE_ID_VIA_6410),      1 },
488
480
        { PCI_VDEVICE(VIA, PCI_DEVICE_ID_VIA_SATA_EIDE), 1 },
489
481
        { 0, },