diff options
Diffstat (limited to 'linux')
| -rw-r--r-- | linux/Makefrag.am | 3 | ||||
| -rw-r--r-- | linux/src/drivers/pci/pci.c | 4 |
2 files changed, 3 insertions, 4 deletions
diff --git a/linux/Makefrag.am b/linux/Makefrag.am index 52bc8907..fccb8070 100644 --- a/linux/Makefrag.am +++ b/linux/Makefrag.am @@ -528,7 +528,8 @@ endif if device_driver_sis900 liblinux_a_SOURCES += \ - linux/src/drivers/net/sis900.c + linux/src/drivers/net/sis900.c \ + linux/src/drivers/net/sis900.h endif if device_driver_sk_g16 diff --git a/linux/src/drivers/pci/pci.c b/linux/src/drivers/pci/pci.c index bb79cc47..cf7dd807 100644 --- a/linux/src/drivers/pci/pci.c +++ b/linux/src/drivers/pci/pci.c @@ -1121,10 +1121,8 @@ static unsigned int scan_bus(struct pci_bus *bus, unsigned long *mem_startp) pcibios_read_config_dword(bus->number, devfn, PCI_VENDOR_ID, &l); /* some broken boards return 0 if a slot is empty: */ - if (l == 0xffffffff || l == 0x00000000) { - is_multi = 0; + if (l == 0xffffffff || l == 0x00000000 || l == 0x0000ffff || l == 0xffff0000) continue; - } dev = pci_malloc(sizeof(*dev), mem_startp); dev->bus = bus; |