Merge git://git.linux-xtensa.org/kernel/xtensa-feed

[linux-2.6-omap-h63xx.git] / arch / sparc64 / kernel / isa.c

diff --git a/arch/sparc64/kernel/isa.c b/arch/sparc64/kernel/isa.c
index 6a6882e57ff22ff3c5f1aee779b761d20b493ab6..0f19dce1c905c699e30361a7f6c6397cffc5c3c7 100644 (file)
--- a/arch/sparc64/kernel/isa.c
+++ b/arch/sparc64/kernel/isa.c
@@ -79,6 +79,7 @@ static void __init isa_fill_devices(struct sparc_isa_bridge *isa_br)
 
        while (dp) {
                struct sparc_isa_device *isa_dev;
+               struct dev_archdata *sd;
 
                isa_dev = kzalloc(sizeof(*isa_dev), GFP_KERNEL);
                if (!isa_dev) {
@@ -86,6 +87,12 @@ static void __init isa_fill_devices(struct sparc_isa_bridge *isa_br)
                        return;
                }
 
+               sd = &isa_dev->ofdev.dev.archdata;
+               sd->prom_node = dp;
+               sd->op = &isa_dev->ofdev;
+               sd->iommu = isa_br->ofdev.dev.parent->archdata.iommu;
+               sd->stc = isa_br->ofdev.dev.parent->archdata.stc;
+
                isa_dev->ofdev.node = dp;
                isa_dev->ofdev.dev.parent = &isa_br->ofdev.dev;
                isa_dev->ofdev.dev.bus = &isa_bus_type;