diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2010-05-18 12:27:49 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2010-05-18 12:27:49 -0400 |
| commit | 96fbeb973a7e17594a429537201611ca0b395622 (patch) | |
| tree | 0f90e3724f804776d6ae00009c2e30bd4ab015aa /arch/x86/pci | |
| parent | 1f8caa986a5f4de2e40f3defe66a07b4c5a019c2 (diff) | |
| parent | fea24e28c663e62663097f0ed3b8ff1f9a87f15e (diff) | |
Merge branch 'x86-mrst-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip
* 'x86-mrst-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
x86, mrst: add nop functions to x86_init mpparse functions
x86, mrst, pci: return 0 for non-present pci bars
x86: Avoid check hlt for newer cpus
Diffstat (limited to 'arch/x86/pci')
| -rw-r--r-- | arch/x86/pci/mrst.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/x86/pci/mrst.c b/arch/x86/pci/mrst.c index 1cdc02cf8fa4..7ef3a2735df3 100644 --- a/arch/x86/pci/mrst.c +++ b/arch/x86/pci/mrst.c | |||
| @@ -109,7 +109,7 @@ static int pci_device_update_fixed(struct pci_bus *bus, unsigned int devfn, | |||
| 109 | decode++; | 109 | decode++; |
| 110 | decode = ~(decode - 1); | 110 | decode = ~(decode - 1); |
| 111 | } else { | 111 | } else { |
| 112 | decode = ~0; | 112 | decode = 0; |
| 113 | } | 113 | } |
| 114 | 114 | ||
| 115 | /* | 115 | /* |