git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-2.6
[pandora-kernel.git]
/
arch
/
sparc64
/
kernel
/
of_device.c
diff --git
a/arch/sparc64/kernel/of_device.c
b/arch/sparc64/kernel/of_device.c
index
f845f15
..
100ebd5
100644
(file)
--- a/
arch/sparc64/kernel/of_device.c
+++ b/
arch/sparc64/kernel/of_device.c
@@
-169,7
+169,7
@@
static unsigned long of_bus_default_get_flags(const u32 *addr, unsigned long fla
static int of_bus_pci_match(struct device_node *np)
{
static int of_bus_pci_match(struct device_node *np)
{
- if (!strcmp(np->
type, "pci") || !strcmp(np->type, "pciex
")) {
+ if (!strcmp(np->
name, "pci
")) {
const char *model = of_get_property(np, "model", NULL);
if (model && !strcmp(model, "SUNW,simba"))
const char *model = of_get_property(np, "model", NULL);
if (model && !strcmp(model, "SUNW,simba"))
@@
-200,7
+200,7
@@
static int of_bus_simba_match(struct device_node *np)
/* Treat PCI busses lacking ranges property just like
* simba.
*/
/* Treat PCI busses lacking ranges property just like
* simba.
*/
- if (!strcmp(np->
type, "pci") || !strcmp(np->type, "pciex
")) {
+ if (!strcmp(np->
name, "pci
")) {
if (!of_find_property(np, "ranges", NULL))
return 1;
}
if (!of_find_property(np, "ranges", NULL))
return 1;
}
@@
-429,7
+429,7
@@
static int __init use_1to1_mapping(struct device_node *pp)
* it lacks a ranges property, and this will include
* cases like Simba.
*/
* it lacks a ranges property, and this will include
* cases like Simba.
*/
- if (!strcmp(pp->
type, "pci") || !strcmp(pp->type, "pciex
"))
+ if (!strcmp(pp->
name, "pci
"))
return 0;
return 1;
return 0;
return 1;
@@
-714,8
+714,7
@@
static unsigned int __init build_one_device_irq(struct of_device *op,
break;
}
} else {
break;
}
} else {
- if (!strcmp(pp->type, "pci") ||
- !strcmp(pp->type, "pciex")) {
+ if (!strcmp(pp->name, "pci")) {
unsigned int this_orig_irq = irq;
irq = pci_irq_swizzle(dp, pp, irq);
unsigned int this_orig_irq = irq;
irq = pci_irq_swizzle(dp, pp, irq);