From fa72503e818af3a5b7f546482340e15ff3528fab Mon Sep 17 00:00:00 2001 From: Paul Mackerras Date: Sat, 14 Jan 2006 15:08:50 +1100 Subject: [PATCH] --- yaml --- r: 18341 b: refs/heads/master c: d5f079000b20887bfbc84d772a27709c5665e652 h: refs/heads/master i: 18339: 94a801ba85f00fc1468f6bed872a7e282d474936 v: v3 --- [refs] | 2 +- trunk/arch/powerpc/kernel/prom_parse.c | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 3754e7f7718c..33e0538b7f1a 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: b4e7de0f3575f4862f04921c5bd0cb5680cc8d71 +refs/heads/master: d5f079000b20887bfbc84d772a27709c5665e652 diff --git a/trunk/arch/powerpc/kernel/prom_parse.c b/trunk/arch/powerpc/kernel/prom_parse.c index 309ae1d5fa77..a8099c806150 100644 --- a/trunk/arch/powerpc/kernel/prom_parse.c +++ b/trunk/arch/powerpc/kernel/prom_parse.c @@ -113,7 +113,8 @@ static unsigned int of_bus_default_get_flags(u32 *addr) static int of_bus_pci_match(struct device_node *np) { - return !strcmp(np->type, "pci"); + /* "vci" is for the /chaos bridge on 1st-gen PCI powermacs */ + return !strcmp(np->type, "pci") || !strcmp(np->type, "vci"); } static void of_bus_pci_count_cells(struct device_node *np,