xiaomi-sm8450/android_kernel_xiaomi_sm8450
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge tag 'v3.14-rc5' into HEAD

Browse Source 
Linux 3.14-rc5
This commit is contained in:
Grant Likely
2014-03-04 16:44:10 +08:00
parent a3dbeb5b45 0414855fdc
commit dab2310d9d
1196 changed files with 14633 additions and 7360 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
drivers/of/address.c
View File

@@ -99,11 +99,12 @@ static unsigned int of_bus_default_get_flags(const __be32 *addr)
static int of_bus_pci_match(struct device_node *np)
{
/*
* "pciex" is PCI Express
* "vci" is for the /chaos bridge on 1st-gen PCI powermacs
* "ht" is hypertransport
*/
return !strcmp(np->type, "pci") || !strcmp(np->type, "vci") ||
!strcmp(np->type, "ht");
return !strcmp(np->type, "pci") || !strcmp(np->type, "pciex") ||
!strcmp(np->type, "vci") || !strcmp(np->type, "ht");
}
static void of_bus_pci_count_cells(struct device_node *np,