summaryrefslogtreecommitdiff
path: root/drivers/ide
diff options
context:
space:
mode:
authorJeff Garzik <jeff@garzik.org>2006-05-24 05:32:42 (GMT)
committerJeff Garzik <jeff@garzik.org>2006-05-24 05:32:42 (GMT)
commit26e27cd424554202d36f38ee35421143788da127 (patch)
tree04d068c76af5b636c061173465faa574d4b5e7b0 /drivers/ide
parentb74ba22f030eb7ab88f7d8954ad18ecc0ac5ce3c (diff)
parent387e2b0439026aa738a9edca15a57e5c0bcb4dfc (diff)
downloadlinux-fsl-qoriq-26e27cd424554202d36f38ee35421143788da127.tar.xz
Merge branch 'master' into upstream
Diffstat (limited to 'drivers/ide')
-rw-r--r--drivers/ide/ppc/pmac.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/ide/ppc/pmac.c b/drivers/ide/ppc/pmac.c
index 78e30f8..ffca8b6 100644
--- a/drivers/ide/ppc/pmac.c
+++ b/drivers/ide/ppc/pmac.c
@@ -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)))