git://git.onelab.eu
/
linux-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
linux 2.6.16.38 w/ vs2.0.3-rc1
[linux-2.6.git]
/
arch
/
powerpc
/
kernel
/
pci_dn.c
diff --git
a/arch/powerpc/kernel/pci_dn.c
b/arch/powerpc/kernel/pci_dn.c
index
1c18953
..
12c4c9e
100644
(file)
--- a/
arch/powerpc/kernel/pci_dn.c
+++ b/
arch/powerpc/kernel/pci_dn.c
@@
-31,7
+31,6
@@
#include <asm/pci-bridge.h>
#include <asm/pSeries_reconfig.h>
#include <asm/ppc-pci.h>
#include <asm/pci-bridge.h>
#include <asm/pSeries_reconfig.h>
#include <asm/ppc-pci.h>
-#include <asm/firmware.h>
/*
* Traverse_func that inits the PCI fields of the device node.
/*
* Traverse_func that inits the PCI fields of the device node.
@@
-60,11
+59,6
@@
static void * __devinit update_dn_pci_info(struct device_node *dn, void *data)
pdn->busno = (regs[0] >> 16) & 0xff;
pdn->devfn = (regs[0] >> 8) & 0xff;
}
pdn->busno = (regs[0] >> 16) & 0xff;
pdn->devfn = (regs[0] >> 8) & 0xff;
}
- if (firmware_has_feature(FW_FEATURE_ISERIES)) {
- u32 *busp = (u32 *)get_property(dn, "linux,subbus", NULL);
- if (busp)
- pdn->bussubno = *busp;
- }
pdn->pci_ext_config_space = (type && *type == 1);
return NULL;
pdn->pci_ext_config_space = (type && *type == 1);
return NULL;