diff options
-rw-r--r-- | drivers/ide/pci/alim15x3.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/drivers/ide/pci/alim15x3.c b/drivers/ide/pci/alim15x3.c index b36a22b8c213..c1922f9cfe80 100644 --- a/drivers/ide/pci/alim15x3.c +++ b/drivers/ide/pci/alim15x3.c | |||
@@ -412,14 +412,14 @@ static u8 __devinit ali_cable_detect(ide_hwif_t *hwif) | |||
412 | return cbl; | 412 | return cbl; |
413 | } | 413 | } |
414 | 414 | ||
415 | #ifndef CONFIG_SPARC64 | 415 | #if !defined(CONFIG_SPARC64) && !defined(CONFIG_PPC) |
416 | /** | 416 | /** |
417 | * init_hwif_ali15x3 - Initialize the ALI IDE x86 stuff | 417 | * init_hwif_ali15x3 - Initialize the ALI IDE x86 stuff |
418 | * @hwif: interface to configure | 418 | * @hwif: interface to configure |
419 | * | 419 | * |
420 | * Obtain the IRQ tables for an ALi based IDE solution on the PC | 420 | * Obtain the IRQ tables for an ALi based IDE solution on the PC |
421 | * class platforms. This part of the code isn't applicable to the | 421 | * class platforms. This part of the code isn't applicable to the |
422 | * Sparc systems | 422 | * Sparc and PowerPC systems. |
423 | */ | 423 | */ |
424 | 424 | ||
425 | static void __devinit init_hwif_ali15x3 (ide_hwif_t *hwif) | 425 | static void __devinit init_hwif_ali15x3 (ide_hwif_t *hwif) |
@@ -463,7 +463,9 @@ static void __devinit init_hwif_ali15x3 (ide_hwif_t *hwif) | |||
463 | hwif->irq = irq; | 463 | hwif->irq = irq; |
464 | } | 464 | } |
465 | } | 465 | } |
466 | #endif | 466 | #else |
467 | #define init_hwif_ali15x3 NULL | ||
468 | #endif /* !defined(CONFIG_SPARC64) && !defined(CONFIG_PPC) */ | ||
467 | 469 | ||
468 | /** | 470 | /** |
469 | * init_dma_ali15x3 - set up DMA on ALi15x3 | 471 | * init_dma_ali15x3 - set up DMA on ALi15x3 |
@@ -517,9 +519,7 @@ static const struct ide_dma_ops ali_dma_ops = { | |||
517 | static const struct ide_port_info ali15x3_chipset __devinitdata = { | 519 | static const struct ide_port_info ali15x3_chipset __devinitdata = { |
518 | .name = "ALI15X3", | 520 | .name = "ALI15X3", |
519 | .init_chipset = init_chipset_ali15x3, | 521 | .init_chipset = init_chipset_ali15x3, |
520 | #ifndef CONFIG_SPARC64 | ||
521 | .init_hwif = init_hwif_ali15x3, | 522 | .init_hwif = init_hwif_ali15x3, |
522 | #endif | ||
523 | .init_dma = init_dma_ali15x3, | 523 | .init_dma = init_dma_ali15x3, |
524 | .port_ops = &ali_port_ops, | 524 | .port_ops = &ali_port_ops, |
525 | .pio_mask = ATA_PIO5, | 525 | .pio_mask = ATA_PIO5, |