diff options
| author | Grant Likely <grant.likely@linaro.org> | 2014-03-04 03:44:10 -0500 |
|---|---|---|
| committer | Grant Likely <grant.likely@linaro.org> | 2014-03-04 03:44:10 -0500 |
| commit | dab2310d9d90eded48625c5382c6a60389bf8ca9 (patch) | |
| tree | 9327cc815d69dec23aebf03407e3fa82b6d2fbaa /drivers/of/address.c | |
| parent | a3dbeb5b45af5b6113385db89fce2a8279278e8b (diff) | |
| parent | 0414855fdc4a40da05221fc6062cccbc0c30f169 (diff) | |
Merge tag 'v3.14-rc5' into HEAD
Linux 3.14-rc5
Diffstat (limited to 'drivers/of/address.c')
| -rw-r--r-- | drivers/of/address.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/drivers/of/address.c b/drivers/of/address.c index fe44c74ff4bd..cb4242a69cd5 100644 --- a/drivers/of/address.c +++ b/drivers/of/address.c | |||
| @@ -99,11 +99,12 @@ static unsigned int of_bus_default_get_flags(const __be32 *addr) | |||
| 99 | static int of_bus_pci_match(struct device_node *np) | 99 | static int of_bus_pci_match(struct device_node *np) |
| 100 | { | 100 | { |
| 101 | /* | 101 | /* |
| 102 | * "pciex" is PCI Express | ||
| 102 | * "vci" is for the /chaos bridge on 1st-gen PCI powermacs | 103 | * "vci" is for the /chaos bridge on 1st-gen PCI powermacs |
| 103 | * "ht" is hypertransport | 104 | * "ht" is hypertransport |
| 104 | */ | 105 | */ |
| 105 | return !strcmp(np->type, "pci") || !strcmp(np->type, "vci") || | 106 | return !strcmp(np->type, "pci") || !strcmp(np->type, "pciex") || |
| 106 | !strcmp(np->type, "ht"); | 107 | !strcmp(np->type, "vci") || !strcmp(np->type, "ht"); |
| 107 | } | 108 | } |
| 108 | 109 | ||
| 109 | static void of_bus_pci_count_cells(struct device_node *np, | 110 | static void of_bus_pci_count_cells(struct device_node *np, |