diff options
author | Paul Mackerras <paulus@samba.org> | 2007-05-10 07:08:37 -0400 |
---|---|---|
committer | Paul Mackerras <paulus@samba.org> | 2007-05-10 07:08:37 -0400 |
commit | 2ecf042ef530dd0943e41d84b6344f507941af3e (patch) | |
tree | 73100361dd74e3f80f14c7c81ba4675948983f44 /drivers/ide/mips | |
parent | 32a56ebb24f23da1bbaf24292acf85b6c04526ab (diff) | |
parent | de5603748af8bf7deac403e6ba92887f8d18e812 (diff) |
Merge branch 'linux-2.6'
Diffstat (limited to 'drivers/ide/mips')
-rw-r--r-- | drivers/ide/mips/au1xxx-ide.c | 3 | ||||
-rw-r--r-- | drivers/ide/mips/swarm.c | 3 |
2 files changed, 6 insertions, 0 deletions
diff --git a/drivers/ide/mips/au1xxx-ide.c b/drivers/ide/mips/au1xxx-ide.c index d54d9fe92a7d..ca95e990862e 100644 --- a/drivers/ide/mips/au1xxx-ide.c +++ b/drivers/ide/mips/au1xxx-ide.c | |||
@@ -760,6 +760,9 @@ static int au_ide_probe(struct device *dev) | |||
760 | #endif | 760 | #endif |
761 | 761 | ||
762 | probe_hwif_init(hwif); | 762 | probe_hwif_init(hwif); |
763 | |||
764 | ide_proc_register_port(hwif); | ||
765 | |||
763 | dev_set_drvdata(dev, hwif); | 766 | dev_set_drvdata(dev, hwif); |
764 | 767 | ||
765 | printk(KERN_INFO "Au1xxx IDE(builtin) configured for %s\n", mode ); | 768 | printk(KERN_INFO "Au1xxx IDE(builtin) configured for %s\n", mode ); |
diff --git a/drivers/ide/mips/swarm.c b/drivers/ide/mips/swarm.c index 81fa06851b27..6e935d7c63fd 100644 --- a/drivers/ide/mips/swarm.c +++ b/drivers/ide/mips/swarm.c | |||
@@ -129,6 +129,9 @@ static int __devinit swarm_ide_probe(struct device *dev) | |||
129 | hwif->irq = hwif->hw.irq; | 129 | hwif->irq = hwif->hw.irq; |
130 | 130 | ||
131 | probe_hwif_init(hwif); | 131 | probe_hwif_init(hwif); |
132 | |||
133 | ide_proc_register_port(hwif); | ||
134 | |||
132 | dev_set_drvdata(dev, hwif); | 135 | dev_set_drvdata(dev, hwif); |
133 | 136 | ||
134 | return 0; | 137 | return 0; |