diff options
| author | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-10-09 12:38:44 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-10-09 12:38:44 -0700 |
| commit | 5df3e0d953c8af6f5b96aa090824b929cb5ab599 (patch) | |
| tree | 5ec703d42ebd1fa92150d110d4ce47d7891bf2cd /arch/mips/pci/ops-mace.c | |
| parent | a6d85430424d44e946e0946bfaad607115510989 (diff) | |
| parent | 2da23247935526da567e18caddb4533cfa194aa9 (diff) | |
Merge branch 'upstream' of git://ftp.linux-mips.org/pub/scm/upstream-linus
* 'upstream' of git://ftp.linux-mips.org/pub/scm/upstream-linus:
[MIPS] Au1000: set the PCI controller IO base
[MIPS] Alchemy: Fix USB initialization.
[MIPS] IP32: Fix fatal typo in address computation.
Diffstat (limited to 'arch/mips/pci/ops-mace.c')
| -rw-r--r-- | arch/mips/pci/ops-mace.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/mips/pci/ops-mace.c b/arch/mips/pci/ops-mace.c index 2025f1f3e9f5..fe5451449304 100644 --- a/arch/mips/pci/ops-mace.c +++ b/arch/mips/pci/ops-mace.c @@ -33,7 +33,7 @@ static inline int mkaddr(struct pci_bus *bus, unsigned int devfn, unsigned int reg) { return ((bus->number & 0xff) << 16) | - (devfn & 0xff) << 8) | + ((devfn & 0xff) << 8) | (reg & 0xfc); } |