Merge branch 'linux-2.6'

This commit is contained in:
Paul Mackerras
2007-02-07 14:05:13 +11:00
387 changed files with 3087 additions and 2533 deletions

View File

@ -1429,7 +1429,7 @@ long sys_pciconfig_iobase(long which, unsigned long in_bus,
for (ln = pci_root_buses.next; ln != &pci_root_buses; ln = ln->next) {
bus = pci_bus_b(ln);
if (in_bus >= bus->number && in_bus < (bus->number + bus->subordinate))
if (in_bus >= bus->number && in_bus <= bus->subordinate)
break;
bus = NULL;
}