diff options
| author | James Bottomley <jejb@mulgrave.il.steeleye.com> | 2006-06-10 14:47:26 -0400 |
|---|---|---|
| committer | James Bottomley <jejb@mulgrave.il.steeleye.com> | 2006-06-10 14:47:26 -0400 |
| commit | f0cd91a68acdc9b49d7f6738b514a426da627649 (patch) | |
| tree | 8ad73564015794197583b094217ae0a71e71e753 /drivers/ide/ppc/pmac.c | |
| parent | 60eef25701d25e99c991dd0f4a9f3832a0c3ad3e (diff) | |
| parent | 128e6ced247cda88f96fa9f2e4ba8b2c4a681560 (diff) | |
Merge ../linux-2.6
Diffstat (limited to 'drivers/ide/ppc/pmac.c')
| -rw-r--r-- | drivers/ide/ppc/pmac.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/ide/ppc/pmac.c b/drivers/ide/ppc/pmac.c index 78e30f803671..ffca8b63ee79 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, | |||
| 553 | 553 | ||
| 554 | if (irq != NULL) | 554 | if (irq != NULL) |
| 555 | *irq = pmac_ide[ix].irq; | 555 | *irq = pmac_ide[ix].irq; |
| 556 | |||
| 557 | hw->dev = &pmac_ide[ix].mdev->ofdev.dev; | ||
| 556 | } | 558 | } |
| 557 | 559 | ||
| 558 | #define PMAC_IDE_REG(x) ((void __iomem *)(IDE_DATA_REG+(x))) | 560 | #define PMAC_IDE_REG(x) ((void __iomem *)(IDE_DATA_REG+(x))) |