Gitweb: http://git.kernel.org/git/?p=linux/kernel/git/torvalds/linux-2.6.git;a=commit;h=c96bede657510cfb171c0fd86fc710582a1c5a5f Commit: c96bede657510cfb171c0fd86fc710582a1c5a5f Parent: cb993029094ed61f286793819d3aaa1deea5b252 Author: Stephen Rothwell <[EMAIL PROTECTED]> AuthorDate: Tue Dec 11 11:03:48 2007 +1100 Committer: Paul Mackerras <[EMAIL PROTECTED]> CommitDate: Tue Dec 11 13:42:34 2007 +1100
[POWERPC] iSeries: hose->buid is always zero for iSeries so remove a firmware feature test. Signed-off-by: Stephen Rothwell <[EMAIL PROTECTED]> Signed-off-by: Paul Mackerras <[EMAIL PROTECTED]> --- arch/powerpc/kernel/pci_64.c | 8 ++------ 1 files changed, 2 insertions(+), 6 deletions(-) diff --git a/arch/powerpc/kernel/pci_64.c b/arch/powerpc/kernel/pci_64.c index 69364f3..7e74aa2 100644 --- a/arch/powerpc/kernel/pci_64.c +++ b/arch/powerpc/kernel/pci_64.c @@ -581,12 +581,8 @@ int pcibios_enable_device(struct pci_dev *dev, int mask) /* Decide whether to display the domain number in /proc */ int pci_proc_domain(struct pci_bus *bus) { - if (firmware_has_feature(FW_FEATURE_ISERIES)) - return 0; - else { - struct pci_controller *hose = pci_bus_to_host(bus); - return hose->buid != 0; - } + struct pci_controller *hose = pci_bus_to_host(bus); + return hose->buid != 0; } void __devinit pci_process_bridge_OF_ranges(struct pci_controller *hose, - To unsubscribe from this list: send the line "unsubscribe git-commits-head" in the body of a message to [EMAIL PROTECTED] More majordomo info at http://vger.kernel.org/majordomo-info.html