From: Benjamin Herrenschmidt <benh@kernel.crashing.org>

It looks like the generic ide code now wants ide_init_hwif_ports() to set
the parent struct device into the ide_hw structure (new field ?).  Without
this, the mac ide code can cause the ide probing code to explode in flames
in sysfs registration due to what looks like a stale pointer in there
(happens when removing/re-inserting one of the hotswap media bays on some
laptops).

Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Cc: Bartlomiej Zolnierkiewicz <B.Zolnierkiewicz@elka.pw.edu.pl>
Cc: Alan Cox <alan@lxorguk.ukuu.org.uk>
Signed-off-by: Andrew Morton <akpm@osdl.org>
---

 drivers/ide/ppc/pmac.c |    2 ++
 1 files changed, 2 insertions(+)

diff -puN drivers/ide/ppc/pmac.c~powerpc-fix-ide-pmac-sysfs-entry drivers/ide/ppc/pmac.c
--- 25/drivers/ide/ppc/pmac.c~powerpc-fix-ide-pmac-sysfs-entry	Mon May 15 14:35:58 2006
+++ 25-akpm/drivers/ide/ppc/pmac.c	Mon May 15 14:35:58 2006
@@ -553,6 +553,8 @@ pmac_ide_init_hwif_ports(hw_regs_t *hw,
 
 	if (irq != NULL)
 		*irq = pmac_ide[ix].irq;
+
+	hw->dev = &pmac_ide[ix].mdev->ofdev.dev;
 }
 
 #define PMAC_IDE_REG(x) ((void __iomem *)(IDE_DATA_REG+(x)))
_