diff options
| author | Trond Myklebust <Trond.Myklebust@netapp.com> | 2006-03-23 23:44:19 -0500 |
|---|---|---|
| committer | Trond Myklebust <Trond.Myklebust@netapp.com> | 2006-03-23 23:44:19 -0500 |
| commit | 1ebbe2b20091d306453a5cf480a87e6cd28ae76f (patch) | |
| tree | f5cd7a0fa69b8b1938cb5a0faed2e7b0628072a5 /arch/mips/pci/pci-bcm1480ht.c | |
| parent | ac58c9059da8886b5e8cde012a80266b18ca146e (diff) | |
| parent | 674a396c6d2ba0341ebdd7c1c9950f32f018e2dd (diff) | |
Merge branch 'linus'
Diffstat (limited to 'arch/mips/pci/pci-bcm1480ht.c')
| -rw-r--r-- | arch/mips/pci/pci-bcm1480ht.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/mips/pci/pci-bcm1480ht.c b/arch/mips/pci/pci-bcm1480ht.c index aca4a2e7a1c6..a3eebe5890a7 100644 --- a/arch/mips/pci/pci-bcm1480ht.c +++ b/arch/mips/pci/pci-bcm1480ht.c | |||
| @@ -95,7 +95,7 @@ static int bcm1480ht_can_access(struct pci_bus *bus, int devfn) | |||
| 95 | 95 | ||
| 96 | if (bus->number == 0) { | 96 | if (bus->number == 0) { |
| 97 | devno = PCI_SLOT(devfn); | 97 | devno = PCI_SLOT(devfn); |
| 98 | if (bcm1480ht_bus_status & PCI_DEVICE_MODE) | 98 | if (bcm1480ht_bus_status & PCI_DEVICE_MODE) |
| 99 | return 0; | 99 | return 0; |
| 100 | } | 100 | } |
| 101 | return 1; | 101 | return 1; |