diff options
| author | Linus Torvalds <torvalds@g5.osdl.org> | 2005-11-09 22:57:25 -0500 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2005-11-09 22:57:25 -0500 |
| commit | 3b44f137b9a846c5452d9e6e1271b79b1dbcc942 (patch) | |
| tree | 2465db413b527b65f2000aa7aa33d0f962ca3479 /drivers/ide/ide.c | |
| parent | b01a55a865eeac0371f1a73d36b134d23d938e1a (diff) | |
| parent | 07203f6471a11f4eda48acbe528c0ce4704ad42c (diff) | |
Merge master.kernel.org:/pub/scm/linux/kernel/git/bart/ide-2.6
Diffstat (limited to 'drivers/ide/ide.c')
| -rw-r--r-- | drivers/ide/ide.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/ide/ide.c b/drivers/ide/ide.c index 9fe19808d815..8af179b531c3 100644 --- a/drivers/ide/ide.c +++ b/drivers/ide/ide.c | |||
| @@ -803,6 +803,7 @@ found: | |||
| 803 | hwif->irq = hw->irq; | 803 | hwif->irq = hw->irq; |
| 804 | hwif->noprobe = 0; | 804 | hwif->noprobe = 0; |
| 805 | hwif->chipset = hw->chipset; | 805 | hwif->chipset = hw->chipset; |
| 806 | hwif->gendev.parent = hw->dev; | ||
| 806 | 807 | ||
| 807 | if (!initializing) { | 808 | if (!initializing) { |
| 808 | probe_hwif_init_with_fixup(hwif, fixup); | 809 | probe_hwif_init_with_fixup(hwif, fixup); |