diff options
| author | Ingo Molnar <mingo@elte.hu> | 2008-07-18 15:13:20 -0400 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2008-07-18 15:13:20 -0400 |
| commit | f6dc8ccaab6d8f63cbae1e6c73fe972b26f5376c (patch) | |
| tree | c5643fcdc884a8d0bfc3f1bc28039cab7394e5bc /arch/x86/pci/mmconfig-shared.c | |
| parent | 323ec001c6bb98eeabb5abbdbb8c8055d9496554 (diff) | |
| parent | 5b664cb235e97afbf34db9c4d77f08ebd725335e (diff) | |
Merge branch 'linus' into core/generic-dma-coherent
Conflicts:
kernel/Makefile
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'arch/x86/pci/mmconfig-shared.c')
| -rw-r--r-- | arch/x86/pci/mmconfig-shared.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/x86/pci/mmconfig-shared.c b/arch/x86/pci/mmconfig-shared.c index 0cfebecf2a8f..23faaa890ffc 100644 --- a/arch/x86/pci/mmconfig-shared.c +++ b/arch/x86/pci/mmconfig-shared.c | |||
| @@ -374,7 +374,7 @@ reject: | |||
| 374 | 374 | ||
| 375 | static int __initdata known_bridge; | 375 | static int __initdata known_bridge; |
| 376 | 376 | ||
| 377 | void __init __pci_mmcfg_init(int early) | 377 | static void __init __pci_mmcfg_init(int early) |
| 378 | { | 378 | { |
| 379 | /* MMCONFIG disabled */ | 379 | /* MMCONFIG disabled */ |
| 380 | if ((pci_probe & PCI_PROBE_MMCONF) == 0) | 380 | if ((pci_probe & PCI_PROBE_MMCONF) == 0) |