From db42d289a9cfdcf693d52c9bc3df641bc020d067 Mon Sep 17 00:00:00 2001 From: Adrian Bunk Date: Fri, 1 Feb 2008 23:09:16 +0100 Subject: [PATCH] --- yaml --- r: 82071 b: refs/heads/master c: 468e468139ffbc4f0ce44862eec6dd0f5ac80945 h: refs/heads/master i: 82069: 6fcfb6275430e95087c6d3d540988daefa9c5a92 82067: 4a6828e66ec56ae15d0b87a9845d737b553e1864 82063: 697cc6fad58947c163b91dc130c6d6cdb9c52d88 v: v3 --- [refs] | 2 +- trunk/drivers/ide/ppc/pmac.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 15765d389ae2..36368d7811dd 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: da6f4c7f6fe02f92aff72071ed541f59e5880398 +refs/heads/master: 468e468139ffbc4f0ce44862eec6dd0f5ac80945 diff --git a/trunk/drivers/ide/ppc/pmac.c b/trunk/drivers/ide/ppc/pmac.c index 736d12c8e68a..4afc58fb3674 100644 --- a/trunk/drivers/ide/ppc/pmac.c +++ b/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