Merge branches 'release' and 'autoload' into release

[linux-2.6-omap-h63xx.git] / arch / ppc / syslib / mpc52xx_pci.c

diff --git a/arch/ppc/syslib/mpc52xx_pci.c b/arch/ppc/syslib/mpc52xx_pci.c
index 9ec525f9fe98c910235c65fb5efa5f94bcf71638..20a0eac0dc3a3fbd8ca4a6f3bbd59e6a64295dc3 100644 (file)
--- a/arch/ppc/syslib/mpc52xx_pci.c
+++ b/arch/ppc/syslib/mpc52xx_pci.c
@@ -11,7 +11,6 @@
  * kind, whether express or implied.
  */
 
-#include <linux/config.h>
 
 #include <asm/pci.h>
 
@@ -225,7 +224,8 @@ mpc52xx_pci_fixup_resources(struct pci_dev *dev)
        /* The PCI Host bridge of MPC52xx has a prefetch memory resource
           fixed to 1Gb. Doesn't fit in the resource system so we remove it */
        if ( (dev->vendor == PCI_VENDOR_ID_MOTOROLA) &&
-            (dev->device == PCI_DEVICE_ID_MOTOROLA_MPC5200) ) {
+            (   dev->device == PCI_DEVICE_ID_MOTOROLA_MPC5200
+             || dev->device == PCI_DEVICE_ID_MOTOROLA_MPC5200B) ) {
                struct resource *res = &dev->resource[1];
                res->start = res->end = res->flags = 0;
        }