diff options
| author | Linus Torvalds <torvalds@g5.osdl.org> | 2006-10-05 15:51:43 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-10-05 15:54:07 -0700 |
| commit | e03508b43fd93410c1abda2eeabe021de8461f95 (patch) | |
| tree | 4e06ae2ce0e6a0c5c93a8ad79322ff53a11fc874 /arch/i386/pci/direct.c | |
| parent | d7a297baa6edea94167163bed808c6a8933bd5aa (diff) | |
| parent | 88271e9e43e65537c6390af3718a60c45c787e8f (diff) | |
| download | blackbird-op-linux-e03508b43fd93410c1abda2eeabe021de8461f95.tar.gz blackbird-op-linux-e03508b43fd93410c1abda2eeabe021de8461f95.zip | |
Merge branch 'for-linus' of git://one.firstfloor.org/home/andi/git/linux-2.6
* 'for-linus' of git://one.firstfloor.org/home/andi/git/linux-2.6:
[PATCH] i386: fix rwsem build bug on CONFIG_M386=y
[PATCH] x86-64: Annotate interrupt frame backlink in interrupt handlers
[PATCH] x86-64: Fix FPU corruption
[PATCH] x86: Terminate the kernel stacks for the unwinder
[PATCH] i386: Fix PCI BIOS config space access
[PATCH] x86-64: Calgary IOMMU: print PCI bus numbers in hex
[PATCH] x86-64: Calgary IOMMU: Update Jon's contact info
[PATCH] x86-64: Calgary IOMMU: Fix off by one when calculating register space location
[PATCH] x86-64: Calgary IOMMU: deobfuscate calgary_init
[PATCH] i386: Update defconfig
[PATCH] x86-64: Update defconfig
[ Manually skipped commits that incorrectly ignored AC in kernel space.
The alignment fault is defined to only happen for CPL3 anyway - Linus ]
Diffstat (limited to 'arch/i386/pci/direct.c')
| -rw-r--r-- | arch/i386/pci/direct.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/arch/i386/pci/direct.c b/arch/i386/pci/direct.c index 5acf0b4743cf..431c9a51b157 100644 --- a/arch/i386/pci/direct.c +++ b/arch/i386/pci/direct.c @@ -256,6 +256,8 @@ static int __init pci_check_type2(void) void __init pci_direct_init(int type) { + if (type == 0) + return; printk(KERN_INFO "PCI: Using configuration type %d\n", type); if (type == 1) raw_pci_ops = &pci_direct_conf1; |
