diff options
Diffstat (limited to 'drivers/ide/via82cxxx.c')
-rw-r--r-- | drivers/ide/via82cxxx.c | 12 |
1 files changed, 1 insertions, 11 deletions
diff --git a/drivers/ide/via82cxxx.c b/drivers/ide/via82cxxx.c index 6092fe3f409d..3ff7231e4858 100644 --- a/drivers/ide/via82cxxx.c +++ b/drivers/ide/via82cxxx.c | |||
@@ -267,7 +267,7 @@ static void via_cable_detect(struct via82cxxx_dev *vdev, u32 u) | |||
267 | * and initialize its drive independent registers. | 267 | * and initialize its drive independent registers. |
268 | */ | 268 | */ |
269 | 269 | ||
270 | static unsigned int init_chipset_via82cxxx(struct pci_dev *dev) | 270 | static int init_chipset_via82cxxx(struct pci_dev *dev) |
271 | { | 271 | { |
272 | struct ide_host *host = pci_get_drvdata(dev); | 272 | struct ide_host *host = pci_get_drvdata(dev); |
273 | struct via82cxxx_dev *vdev = host->host_priv; | 273 | struct via82cxxx_dev *vdev = host->host_priv; |
@@ -443,16 +443,6 @@ static int __devinit via_init_one(struct pci_dev *dev, const struct pci_device_i | |||
443 | if ((via_config->flags & VIA_NO_UNMASK) == 0) | 443 | if ((via_config->flags & VIA_NO_UNMASK) == 0) |
444 | d.host_flags |= IDE_HFLAG_UNMASK_IRQS; | 444 | d.host_flags |= IDE_HFLAG_UNMASK_IRQS; |
445 | 445 | ||
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 | d.udma_mask = via_config->udma_mask; | 446 | d.udma_mask = via_config->udma_mask; |
457 | 447 | ||
458 | vdev = kzalloc(sizeof(*vdev), GFP_KERNEL); | 448 | vdev = kzalloc(sizeof(*vdev), GFP_KERNEL); |