diff options
| author | Linus Torvalds <torvalds@g5.osdl.org> | 2006-01-14 00:24:55 -0500 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-01-14 00:24:55 -0500 |
| commit | 87530db5ec7d519c7ba334e414307c5130ae2da8 (patch) | |
| tree | a1720bb29998d8d658e91ed106263561a8101bf0 /arch/powerpc/kernel/prom_parse.c | |
| parent | a148058c5cf72ad23fb6c4cf9828f7276e13151c (diff) | |
| parent | d5f079000b20887bfbc84d772a27709c5665e652 (diff) | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc-merge
Diffstat (limited to 'arch/powerpc/kernel/prom_parse.c')
| -rw-r--r-- | arch/powerpc/kernel/prom_parse.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/arch/powerpc/kernel/prom_parse.c b/arch/powerpc/kernel/prom_parse.c index 309ae1d5fa..a8099c8061 100644 --- a/arch/powerpc/kernel/prom_parse.c +++ b/arch/powerpc/kernel/prom_parse.c | |||
| @@ -113,7 +113,8 @@ static unsigned int of_bus_default_get_flags(u32 *addr) | |||
| 113 | 113 | ||
| 114 | static int of_bus_pci_match(struct device_node *np) | 114 | static int of_bus_pci_match(struct device_node *np) |
| 115 | { | 115 | { |
| 116 | return !strcmp(np->type, "pci"); | 116 | /* "vci" is for the /chaos bridge on 1st-gen PCI powermacs */ |
| 117 | return !strcmp(np->type, "pci") || !strcmp(np->type, "vci"); | ||
| 117 | } | 118 | } |
| 118 | 119 | ||
| 119 | static void of_bus_pci_count_cells(struct device_node *np, | 120 | static void of_bus_pci_count_cells(struct device_node *np, |