Merge git://git.kernel.org/pub/scm/linux/kernel/git/agk/linux-2.6-dm

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

diff --git a/arch/sparc64/kernel/isa.c b/arch/sparc64/kernel/isa.c
index b5f7b354084f6d91d1da68e2374d7d409f1c5416..a2af5ed784c99bd12def0527f8dccecbbc120725 100644 (file)
--- a/arch/sparc64/kernel/isa.c
+++ b/arch/sparc64/kernel/isa.c
@@ -92,6 +92,7 @@ static void __init isa_fill_devices(struct sparc_isa_bridge *isa_br)
                sd->op = &isa_dev->ofdev;
                sd->iommu = isa_br->ofdev.dev.parent->archdata.iommu;
                sd->stc = isa_br->ofdev.dev.parent->archdata.stc;
+               sd->numa_node = isa_br->ofdev.dev.parent->archdata.numa_node;
 
                isa_dev->ofdev.node = dp;
                isa_dev->ofdev.dev.parent = &isa_br->ofdev.dev;