2008-01-30 20:13:09

by Adrian Bunk

[permalink] [raw]
Subject: [2.6 patch] ide/ppc/pmac.c section fixes

This patch fixes the following section mismatch:

<-- snip -->

...
WARNING: vmlinux.o(.text+0x3b641c): Section mismatch in reference from the function .pmac_ide_setup_device() to the function .init.text:.pmac_ide_setup_dma()
...

<-- snip -->

Signed-off-by: Adrian Bunk <[email protected]>

---

drivers/ide/ppc/pmac.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)

400d1da2f5d6ea50d75a075ed230c244d1631f4a
diff --git a/drivers/ide/ppc/pmac.c b/drivers/ide/ppc/pmac.c
index 736d12c..7aa160e 100644
--- a/drivers/ide/ppc/pmac.c
+++ b/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


Subject: Re: [2.6 patch] ide/ppc/pmac.c section fixes

On Wednesday 30 January 2008, Adrian Bunk wrote:
> This patch fixes the following section mismatch:
>
> <-- snip -->
>
> ...
> WARNING: vmlinux.o(.text+0x3b641c): Section mismatch in reference from the function .pmac_ide_setup_device() to the function .init.text:.pmac_ide_setup_dma()
> ...
>
> <-- snip -->
>
> Signed-off-by: Adrian Bunk <[email protected]>

applied

[ thanks for all patches, especially for fixup-after-Bart ones ;) ]