Merge commit 'v2.6.29' into x86/setup-lzma

[mv-sheeva.git] / arch / x86 / pci / mmconfig_32.c

diff --git a/arch/x86/pci/mmconfig_32.c b/arch/x86/pci/mmconfig_32.c
index 7b75e651343640ffd5147e58c70d5d634e2fba32..8b2d561046a3bba83ef3953171fb1abdd5a195b5 100644 (file)
--- a/arch/x86/pci/mmconfig_32.c
+++ b/arch/x86/pci/mmconfig_32.c
@@ -13,7 +13,7 @@
 #include <linux/init.h>
 #include <linux/acpi.h>
 #include <asm/e820.h>
-#include "pci.h"
+#include <asm/pci_x86.h>
 
 /* Assume systems with more busses have correct MCFG */
 #define mmcfg_virt_addr ((void __iomem *) fix_to_virt(FIX_PCIE_MCFG))
@@ -68,9 +68,6 @@ err:          *value = -1;
                return -EINVAL;
        }
 
-       if (reg < 256)
-               return pci_conf1_read(seg,bus,devfn,reg,len,value);
-
        base = get_base_addr(seg, bus, devfn);
        if (!base)
                goto err;
@@ -104,9 +101,6 @@ static int pci_mmcfg_write(unsigned int seg, unsigned int bus,
        if ((bus > 255) || (devfn > 255) || (reg > 4095))
                return -EINVAL;
 
-       if (reg < 256)
-               return pci_conf1_write(seg,bus,devfn,reg,len,value);
-
        base = get_base_addr(seg, bus, devfn);
        if (!base)
                return -EINVAL;
@@ -138,7 +132,11 @@ static struct pci_raw_ops pci_mmcfg = {
 
 int __init pci_mmcfg_arch_init(void)
 {
-       printk(KERN_INFO "PCI: Using MMCONFIG\n");
-       raw_pci_ops = &pci_mmcfg;
+       printk(KERN_INFO "PCI: Using MMCONFIG for extended config space\n");
+       raw_pci_ext_ops = &pci_mmcfg;
        return 1;
 }
+
+void __init pci_mmcfg_arch_free(void)
+{
+}