---

yaml
---
r: 82071
b: refs/heads/master
c: 468e468
h: refs/heads/master
i:
  82069: 6fcfb62
  82067: 4a6828e
  82063: 697cc6f
v: v3

[refs]

@@ -1,2 +1,2 @@
 ---
-refs/heads/master: da6f4c7f6fe02f92aff72071ed541f59e5880398
+refs/heads/master: 468e468139ffbc4f0ce44862eec6dd0f5ac80945

trunk/drivers/ide/ppc/pmac.c

@@ -1011,7 +1011,7 @@ pmac_ide_do_resume(ide_hwif_t *hwif)
  * (it is kept in 2.4). This introduce an interface numbering change on some
  * rare machines unfortunately, but it's better this way.
  */
-static int
+static int __devinit
 pmac_ide_setup_device(pmac_ide_hwif_t *pmif, ide_hwif_t *hwif, hw_regs_t *hw)
 {
 	struct device_node *np = pmif->node;
@@ -1726,7 +1726,7 @@ pmac_ide_dma_lost_irq (ide_drive_t *drive)
  * Allocate the data structures needed for using DMA with an interface
  * and fill the proper list of functions pointers
  */
-static void __init 
+static void __devinit
 pmac_ide_setup_dma(pmac_ide_hwif_t *pmif, ide_hwif_t *hwif)
 {
 	/* We won't need pci_dev if we switch to generic consistent